Commit f62d28c7 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 2910da05

deploy/tfs.sh

+53 −61
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} 
# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.

export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""}



# If not already set, disable build-if-exists flag to skip building Docker images if they already exist.

# If TFS_BUILD_IF_EXISTS is "NO", the containers are not rebuilt if they already exist.

export TFS_BUILD_IF_EXISTS=${TFS_BUILD_IF_EXISTS:-"YES"}





# ----- CockroachDB ------------------------------------------------------------
@@ -118,6 +114,7 @@ export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"} 
# If not already set, set the external port Grafana HTTP Dashboards will be exposed to.

export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}





########################################################################################################################

# Automated steps start here

########################################################################################################################
@@ -247,8 +244,6 @@ for COMPONENT in $TFS_COMPONENTS; do 
    echo "Processing '$COMPONENT' component..."



    if [ "$TFS_SKIP_BUILD" != "YES" ]; then

        IMAGE_EXISTS=$(docker images -q "$COMPONENT:$TFS_IMAGE_TAG")

        if [ -z "$IMAGE_EXISTS" ] || [ "$TFS_BUILD_IF_EXISTS" == "YES" ]; then

        echo "  Building Docker image..."

        BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"
@@ -316,9 +311,6 @@ for COMPONENT in $TFS_COMPONENTS; do 
            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log"

            docker push "$IMAGE_URL" > "$PUSH_LOG"

        fi

        else

            echo "  Skipping Docker build for '$COMPONENT' as the image already exists and TFS_BUILD_IF_EXISTS is set to 'NO'."

        fi

    fi



    echo "  Adapting '$COMPONENT' manifest file..."

manifests/dltservice.yaml

+12 −0
Original line number Diff line number Diff line
@@ -74,6 +74,18 @@ spec: 
          imagePullPolicy: Always

          ports:

            - containerPort: 50051

          #readinessProbe:

          #  httpGet:

          #    path: /health

          #    port: 8081

          #  initialDelaySeconds: 5

          #  timeoutSeconds: 5

          #livenessProbe:

          #  httpGet:

          #    path: /health

          #    port: 8081

          #  initialDelaySeconds: 5

          #  timeoutSeconds: 5

          resources:

            requests:

              cpu: 200m

src/dlt/connector/client/DltConnectorClient.py

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ from common.tools.client.RetryDecorator import retry, delay_exponential 
from common.tools.grpc.Tools import grpc_message_to_json_string



LOGGER = logging.getLogger(__name__)

LOGGER.setLevel(logging.DEBUG)

MAX_RETRIES = 15

DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0)

RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

src/dlt/connector/client/DltConnectorClientAsync.py

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ from common.tools.client.RetryDecorator import retry, delay_exponential 
from common.tools.grpc.Tools import grpc_message_to_json_string



LOGGER = logging.getLogger(__name__)

LOGGER.setLevel(logging.DEBUG)

MAX_RETRIES = 15

DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0)

RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

src/dlt/connector/client/DltEventsCollector.py

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ from common.tools.grpc.Tools import grpc_message_to_json_string 
from dlt.connector.client.DltGatewayClient import DltGatewayClient



LOGGER = logging.getLogger(__name__)

LOGGER.setLevel(logging.DEBUG)



# This class accepts an event_handler method as attribute that can be used to pre-process and

# filter events before they reach the events_queue. Depending on the handler, the supported