diff --git a/clearing-parent/trade-importer/src/main/resources/application.properties b/clearing-parent/trade-importer/src/main/resources/application.properties index dc8f7ba47..e2cfdbd94 100644 --- a/clearing-parent/trade-importer/src/main/resources/application.properties +++ b/clearing-parent/trade-importer/src/main/resources/application.properties @@ -13,7 +13,7 @@ trade-importer.hazelcast.login=dev trade-importer.hazelcast.password=dev-pass trade-importer.kafka-consumer.bootstrap-servers=localhost:9092 -trade-importer.kafka-consumer.group-id=dev-group- trade-importer +trade-importer.kafka-consumer.group-id=dev-group-trade-importer trade-importer.kafka-consumer.enable-auto-commit=false trade-importer.kafka-consumer.session-timeout-ms=30000 trade-importer.kafka-consumer.auto-offset-reset=latest diff --git a/clearing-parent/trade-importer/src/main/resources/logback.xml b/clearing-parent/trade-importer/src/main/resources/logback.xml new file mode 100644 index 000000000..c49a8bbd0 --- /dev/null +++ b/clearing-parent/trade-importer/src/main/resources/logback.xml @@ -0,0 +1,38 @@ + + + + + + %date{HH:mm:ss.SSS} [%thread] %-5level %class{0}:%line - %message%n + utf-8 + + + + ./logs/trade-importer.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %class{0}:%msg%n + utf8 + + + + ./logs/trade-importer.%i.log + + 1 + 10 + + + 500MB + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index e21bc656f..ce3a0c7c7 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ ${folder_root_clearing}/clearing-parent/imdg ${folder_root_clearing}/clearing-parent/dbf-exporter ${folder_root_clearing}/clearing-parent/dbf-importer + ${folder_root_clearing}/clearing-parent/trade-importer ${folder_root_clearing}/clearing-parent/account-service ${folder_root_clearing}/clearing-parent/balance-service ${folder_root_clearing}/clearing-parent/company-service diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 2414ad7fb..819183670 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -191,6 +191,25 @@ + + copy-trade-importer-bin + prepare-package + + copy + + + + + ${folder_root_trade-importer}/target/trade-importer.jar + ${folder.clearing.distr.modules}/trade-importer/trade-importer.jar + + + ${folder_root_trade-importer}/src/main/resources/application.properties + ${folder.clearing.distr.modules}/trade-importer/application.properties + + + + copy-account-service-bin prepare-package diff --git a/z-distr/src/main/resources/distr/bin/kill_all.sh b/z-distr/src/main/resources/distr/bin/kill_all.sh index 4e9010ebd..f4da3e400 100644 --- a/z-distr/src/main/resources/distr/bin/kill_all.sh +++ b/z-distr/src/main/resources/distr/bin/kill_all.sh @@ -7,6 +7,7 @@ kill -9 $(ps -ef | grep java | grep company-service.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep clearing-service.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep dbf-exporter.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep dbf-importer.jar | awk '{print $2}') +kill -9 $(ps -ef | grep java | grep trade-importer.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep imdg.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep securities-service.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep utility-service.jar | awk '{print $2}') diff --git a/z-distr/src/main/resources/distr/bin/launch_all.sh b/z-distr/src/main/resources/distr/bin/launch_all.sh index 6e5336f8c..18e90c4b0 100644 --- a/z-distr/src/main/resources/distr/bin/launch_all.sh +++ b/z-distr/src/main/resources/distr/bin/launch_all.sh @@ -8,6 +8,7 @@ cd /opt/mfd/clearing/bin /opt/mfd/clearing/bin/clearing-service.sh /opt/mfd/clearing/bin/dbf-exporter.sh /opt/mfd/clearing/bin/dbf-importer.sh +/opt/mfd/clearing/bin/trade-importer.sh /opt/mfd/clearing/bin/securities-service.sh /opt/mfd/clearing/bin/utility-service.sh /opt/mfd/clearing/bin/scheduler-service.sh diff --git a/z-distr/src/main/resources/distr/bin/trade-importer.sh b/z-distr/src/main/resources/distr/bin/trade-importer.sh new file mode 100644 index 000000000..3e4a60f8c --- /dev/null +++ b/z-distr/src/main/resources/distr/bin/trade-importer.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +CLEARING_HOME=/opt/mfd/clearing/ +cd $CLEARING_HOME/bin + +CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7100 -jar trade-importer.jar --spring.config.location=$CLEARING_HOME/settings/trade-importer/" + +$CMD >/dev/null 2>&1 & +