From 9278d559556fa3bc893566b8cbb9bd72f91f9562 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 3 Feb 2026 11:02:15 +0300 Subject: [PATCH] add env to docker-compose --- docker_compose/credit_tracker_config.env | 24 ++++++++++++++++++++- docker_compose/docker-compose.yml | 27 +++++++++++++++++++----- pom.xml | 2 +- start-credit-tracker.sh | 2 +- 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env index 9eed6b5..f96920a 100644 --- a/docker_compose/credit_tracker_config.env +++ b/docker_compose/credit_tracker_config.env @@ -72,7 +72,29 @@ SIGNALS_USER=0001ZZ000001 # min MONITORING_INTERVAL=15 # days -UPDATE_FLAGS_INTERVAL=1 DAYS_TO_UPDATE_FLAGS=30 +UPDATE_FLAGS_CRON_EXPRESSION=0 25 18 * * * +UPDATE_FLAGS_CRON_EXPRESSION=0 25 18 * * * +UPDATE_FIDS_CRON_EXPRESSION=0 10 12 * * * +DAYS_TO_UPDATE_FIDS=30 + +SAVER_SUBJECT_BATCH_SIZE=15000 +PIPELINE_SUBJECT_BATCH_SIZE=10000 +PIPELINE_NAME_ENRICHER_STAGE_CONCURRENCY=20 +PIPELINE_NAME_ENRICHER_QUEUE_CAPACITY=20 +PIPELINE_ID_ENRICHER_STAGE_CONCURRENCY=10 +PIPELINE_ID_ENRICHER_QUEUE_CAPACITY=20 +PIPELINE_MERGER_QUEUE_CAPACITY=50 +PIPELINE_NAME_UPDATER_STAGE_CONCURRENCY=20 +PIPELINE_NAME_UPDATER_QUEUE_CAPACITY=20 +PIPELINE_ID_UPDATER_STAGE_CONCURRENCY=10 +PIPELINE_ID_UPDATER_QUEUE_CAPACITY=20 +FLAG_UPDATER_CONCURRENCY=10 +FLAG_UPDATER_QUEUE_CAPACITY=100 +PIPELINE_ERROR_ATTEMPT_COUNT=5 +PIPELINE_ERROR_ATTEMPT_DELAY=2S +PIPELINE_RETRYABLE_EXCEPTIONS=org.springframework.dao.DataAccessException,org.springframework.dao.DataIntegrityViolationException} +PIPELINE_GLOBAL_TIMEOUT=2H +PIPELINE_PARALLEL_REQUESTS=3 diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml index dd67781..4cf392f 100644 --- a/docker_compose/docker-compose.yml +++ b/docker_compose/docker-compose.yml @@ -60,8 +60,29 @@ services: - SIGNALS_TOKEN=${SIGNALS_TOKEN} - SIGNALS_USER=${SIGNALS_USER} - MONITORING_INTERVAL=${MONITORING_INTERVAL} - - UPDATE_FLAGS_INTERVAL=${UPDATE_FLAGS_INTERVAL} + - UPDATE_FLAGS_CRON_EXPRESSION=${UPDATE_FLAGS_CRON_EXPRESSION} + - UPDATE_FLAGS_CRON_EXPRESSION=${UPDATE_FLAGS_CRON_EXPRESSION} + - UPDATE_FIDS_CRON_EXPRESSION=${UPDATE_FIDS_CRON_EXPRESSION} + - DAYS_TO_UPDATE_FIDS=${DAYS_TO_UPDATE_FIDS} - DAYS_TO_UPDATE_FLAGS=${DAYS_TO_UPDATE_FLAGS} + - SAVER_SUBJECT_BATCH_SIZE=${SAVER_SUBJECT_BATCH_SIZE} + - PIPELINE_SUBJECT_BATCH_SIZE=${PIPELINE_SUBJECT_BATCH_SIZE} + - PIPELINE_NAME_ENRICHER_STAGE_CONCURRENCY=${PIPELINE_NAME_ENRICHER_STAGE_CONCURRENCY} + - PIPELINE_NAME_ENRICHER_QUEUE_CAPACITY=${PIPELINE_NAME_ENRICHER_QUEUE_CAPACITY} + - PIPELINE_ID_ENRICHER_STAGE_CONCURRENCY=${PIPELINE_ID_ENRICHER_STAGE_CONCURRENCY} + - PIPELINE_ID_ENRICHER_QUEUE_CAPACITY=${PIPELINE_ID_ENRICHER_QUEUE_CAPACITY} + - PIPELINE_MERGER_QUEUE_CAPACITY=${PIPELINE_MERGER_QUEUE_CAPACITY} + - PIPELINE_NAME_UPDATER_STAGE_CONCURRENCY=${PIPELINE_NAME_UPDATER_STAGE_CONCURRENCY} + - PIPELINE_NAME_UPDATER_QUEUE_CAPACITY=${PIPELINE_NAME_UPDATER_QUEUE_CAPACITY} + - PIPELINE_ID_UPDATER_STAGE_CONCURRENCY=${PIPELINE_ID_UPDATER_STAGE_CONCURRENCY} + - PIPELINE_ID_UPDATER_QUEUE_CAPACITY=${PIPELINE_ID_UPDATER_QUEUE_CAPACITY} + - FLAG_UPDATER_CONCURRENCY=${FLAG_UPDATER_CONCURRENCY} + - FLAG_UPDATER_QUEUE_CAPACITY=${FLAG_UPDATER_QUEUE_CAPACITY} + - PIPELINE_ERROR_ATTEMPT_COUNT=${PIPELINE_ERROR_ATTEMPT_COUNT} + - PIPELINE_ERROR_ATTEMPT_DELAY=${PIPELINE_ERROR_ATTEMPT_DELAY} + - PIPELINE_RETRYABLE_EXCEPTIONS=${PIPELINE_RETRYABLE_EXCEPTIONS} + - PIPELINE_GLOBAL_TIMEOUT=${PIPELINE_GLOBAL_TIMEOUT} + - PIPELINE_PARALLEL_REQUESTS=${PIPELINE_PARALLEL_REQUESTS} command: ["/opt/app/start-credit-tracker.sh"] credit-tracker-monitoring: @@ -114,12 +135,8 @@ services: - MAX_LIFETIME_SCORING=${MAX_LIFETIME_SCORING} - KEEPALIVE_TIME_SCORING=${KEEPALIVE_TIME_SCORING} - LEAK_DETECTION_THRESHOLD_SCORING=${LEAK_DETECTION_THRESHOLD_SCORING} - - ACCEPTED_XML_SIZE=${ACCEPTED_XML_SIZE} - - ACCEPTED_ARCHIVE_SIZE=${ACCEPTED_ARCHIVE_SIZE} - SIGNALS_ROOT_URI=${SIGNALS_ROOT_URI} - SIGNALS_TOKEN=${SIGNALS_TOKEN} - SIGNALS_USER=${SIGNALS_USER} - MONITORING_INTERVAL=${MONITORING_INTERVAL} - - UPDATE_FLAGS_INTERVAL=${UPDATE_FLAGS_INTERVAL} - - DAYS_TO_UPDATE_FLAGS=${DAYS_TO_UPDATE_FLAGS} command: ["/opt/app/start-credit-tracker.sh"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index d6966c7..90a0117 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ ru.nbch credit-tracker - 2.0 + 2.1 credit_tracker Credit Tracker Application diff --git a/start-credit-tracker.sh b/start-credit-tracker.sh index 0a7ae51..8fdf72b 100644 --- a/start-credit-tracker.sh +++ b/start-credit-tracker.sh @@ -28,5 +28,5 @@ exec java \ -Dcom.sun.management.jmxremote.port="$APP_JMX_PORT" \ -Dcom.sun.management.jmxremote.rmi.port="$APP_JMX_PORT" \ -Djava.rmi.server.hostname="$APP_JMX_HOSTNAME" \ - -DAPP_JAR="${APP_JAR_FILE}" + -DAPP_JAR="${APP_JAR_FILE}" \ -jar credit-tracker-"$APP_JAR_FILE".jar