From be7876e90f333241e4bba618b3356323a0682512 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 3 Feb 2026 16:52:23 +0300 Subject: [PATCH] add env to docker-compose --- credit-tracker.properties | 44 ++++++++++++------------ docker_compose/credit_tracker_config.env | 2 +- docker_compose/docker-compose.yml | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/credit-tracker.properties b/credit-tracker.properties index 7798bed..204d620 100644 --- a/credit-tracker.properties +++ b/credit-tracker.properties @@ -8,7 +8,7 @@ server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b # datasources # indic ct.indic-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver -ct.indic-data-source-settings.url=${DB_URL_INDIC:jdbc:db2://10.230.227.100:2668/cprosd22:currentSchema=INDIC;} +ct.indic-data-source-settings.url=${DB_URL_INDIC:jdbc:db2://10.230.227.102:2668/cprosd22:currentSchema=INDIC;} ct.indic-data-source-settings.username=${USERNAME_INDIC:ros9appl} ct.indic-data-source-settings.password=${PASSWORD_INDIC:R0s9Appl} ct.indic-data-source-settings.maximum-pool-size=${MAXIMUM_POOL_SIZE_INDIC:30} @@ -22,7 +22,7 @@ ct.indic-data-source-settings.leak-detection-threshold=${LEAK_DETECTION_THRESHOL # signal ct.signal-data-source-settings.driver=org.postgresql.Driver -ct.signal-data-source-settings.url=${DB_URL_SIGNAL:jdbc:postgresql://10.200.200.133:5432/credit_tracker} +ct.signal-data-source-settings.url=${DB_URL_SIGNAL:jdbc:postgresql://10.200.200.133:5432/credit_tracker?currentSchema=test_2} ct.signal-data-source-settings.username=${USERNAME_SIGNAL:credit_tracker_user} ct.signal-data-source-settings.password=${PASSWORD_SIGNAL:-} ct.signal-data-source-settings.maximum-pool-size=${MAXIMUM_POOL_SIZE_SIGNAL:40} @@ -56,7 +56,7 @@ spring.servlet.multipart.max-request-size=${ACCEPTED_ARCHIVE_SIZE:2048MB} ct.xsd-validation.monitoring-request-path=monitoring-request.xsd ct.xsd-validation.signal-package-path=signal-package.xsd -ct.signals-root-uri=${SIGNALS_ROOT_URI:http://10.230.227.102:11094/signalRUalfa/} +ct.signals-root-uri=${SIGNALS_ROOT_URI:http://10.230.227.25:9888/signalRUalfa/} ct.signals-token=${SIGNALS_TOKEN:gttcHxwcGojoAvZK} ct.signals-user=${SIGNALS_USER:0001ZZ000001} @@ -67,7 +67,7 @@ ct.load-dir=D:\\folder_name\\signals ct.monitoring-interval=${MONITORING_INTERVAL:15} # days ct.update-flags-cron-expression=${UPDATE_FLAGS_CRON_EXPRESSION:0 25 18 * * *} -ct.new-flags-cron-expression=${UPDATE_FLAGS_CRON_EXPRESSION:0 25 18 * * *} +ct.new-flags-cron-expression=${NEW_FLAGS_CRON_EXPRESSION:0 25 18 * * *} ct.days-to-update-flags=${DAYS_TO_UPDATE_FLAGS:30} ct.update-fid-cron-expression=${UPDATE_FIDS_CRON_EXPRESSION:0 10 12 * * *} ct.days-to-update-fids=${DAYS_TO_UPDATE_FIDS:30} @@ -79,38 +79,38 @@ ct.encoding=windows-1251 #----------------------------Pipeline settings----------------------------# #batch size for saving in phone_fid_map -ct.saver-subject-batch-size=15000 +ct.saver-subject-batch-size=${SAVER_SUBJECT_BATCH_SIZE:15000} #limit on select phone_fid_map -ct.pipeline.subject-batch-size=10000 +ct.pipeline.subject-batch-size=${PIPELINE_SUBJECT_BATCH_SIZE:10000} #STAGES SETTINGS #select NAME + FID BY PHONE -ct.pipeline.name-enricher-stage-concurrency=20 -ct.pipeline.name-enricher-queue-capacity=20 +ct.pipeline.name-enricher-stage-concurrency=${PIPELINE_NAME_ENRICHER_STAGE_CONCURRENCY:20} +ct.pipeline.name-enricher-queue-capacity=${PIPELINE_NAME_ENRICHER_QUEUE_CAPACITY:20} #select ID BY FID -ct.pipeline.id-enricher-stage-concurrency=10 -ct.pipeline.id-enricher-queue-capacity=20 +ct.pipeline.id-enricher-stage-concurrency=${PIPELINE_ID_ENRICHER_STAGE_CONCURRENCY:10} +ct.pipeline.id-enricher-queue-capacity=${PIPELINE_ID_ENRICHER_QUEUE_CAPACITY:20} #Save part of signal xml file and merge; only one thread -ct.pipeline.merger-queue-capacity=50 +ct.pipeline.merger-queue-capacity=${PIPELINE_MERGER_QUEUE_CAPACITY:50} #STAGES SETTINGS #select NAME + FID BY PHONE -ct.pipeline.name-updater-stage-concurrency=20 -ct.pipeline.name-updater-queue-capacity=20 +ct.pipeline.name-updater-stage-concurrency=${PIPELINE_NAME_UPDATER_STAGE_CONCURRENCY:20} +ct.pipeline.name-updater-queue-capacity=${PIPELINE_NAME_UPDATER_QUEUE_CAPACITY:20} #select ID BY FID -ct.pipeline.id-updater-stage-concurrency=10 -ct.pipeline.id-updater-queue-capacity=20 +ct.pipeline.id-updater-stage-concurrency=${PIPELINE_ID_UPDATER_STAGE_CONCURRENCY:10} +ct.pipeline.id-updater-queue-capacity=${PIPELINE_ID_UPDATER_QUEUE_CAPACITY:20} #select and calc flags -ct.flag-updater.concurrency=10 -ct.flag-updater.queue-capacity=100 +ct.flag-updater.concurrency=${FLAG_UPDATER_CONCURRENCY:10} +ct.flag-updater.queue-capacity=${FLAG_UPDATER_QUEUE_CAPACITY:100} #Backoff settings -ct.pipeline.error-attempt-count=5 -ct.pipeline.error-attempt-delay=2s -ct.pipeline.retryable-exceptions=org.springframework.dao.DataAccessException,org.springframework.dao.DataIntegrityViolationException +ct.pipeline.error-attempt-count=${PIPELINE_ERROR_ATTEMPT_COUNT:5} +ct.pipeline.error-attempt-delay=${PIPELINE_ERROR_ATTEMPT_DELAY:2S} +ct.pipeline.retryable-exceptions=${PIPELINE_RETRYABLE_EXCEPTIONS:org.springframework.dao.DataAccessException,org.springframework.dao.DataIntegrityViolationException} #Pipeline global settings -ct.pipeline.global-timeout=2h -ct.pipeline.parallel-requests=3 \ No newline at end of file +ct.pipeline.global-timeout=${PIPELINE_GLOBAL_TIMEOUT:2H} +ct.pipeline.parallel-requests=${PIPELINE_PARALLEL_REQUESTS:3} \ No newline at end of file diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env index f96920a..e74c92a 100644 --- a/docker_compose/credit_tracker_config.env +++ b/docker_compose/credit_tracker_config.env @@ -75,7 +75,7 @@ MONITORING_INTERVAL=15 DAYS_TO_UPDATE_FLAGS=30 UPDATE_FLAGS_CRON_EXPRESSION=0 25 18 * * * -UPDATE_FLAGS_CRON_EXPRESSION=0 25 18 * * * +NEW_FLAGS_CRON_EXPRESSION=0 25 18 * * * UPDATE_FIDS_CRON_EXPRESSION=0 10 12 * * * DAYS_TO_UPDATE_FIDS=30 diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml index 4cf392f..72e32b8 100644 --- a/docker_compose/docker-compose.yml +++ b/docker_compose/docker-compose.yml @@ -61,7 +61,7 @@ services: - SIGNALS_USER=${SIGNALS_USER} - MONITORING_INTERVAL=${MONITORING_INTERVAL} - UPDATE_FLAGS_CRON_EXPRESSION=${UPDATE_FLAGS_CRON_EXPRESSION} - - UPDATE_FLAGS_CRON_EXPRESSION=${UPDATE_FLAGS_CRON_EXPRESSION} + - NEW_FLAGS_CRON_EXPRESSION=${NEW_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}