treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix deadlock

Browse source
This commit is contained in:
etreschenkov 2026-02-09 12:26:36 +03:00
parent 71843eb27f
commit 46ff036c38
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker_compose/credit_tracker_config.env
View file

@ -7,7 +7,8 @@ JMX_MONITORING_PORT=11002
JMX_HOSTNAME= JMX_HOSTNAME=
#volumes #volumes
REPORT_DIR=/opt/credit_tracker_docker/reports REPORT_MAIN_DIR=/opt/credit_tracker_docker/main/reports
REPORT_MONITOR_DIR=/opt/credit_tracker_docker/monitor/reports
LOGS_DIR=/opt/credit_tracker_docker/logs LOGS_DIR=/opt/credit_tracker_docker/logs
JSON_LOGS_DIR=/opt/credit_tracker_docker/logs/json JSON_LOGS_DIR=/opt/credit_tracker_docker/logs/json
ACCESS_LOGS_DIR=/opt/credit_tracker_docker/logs/access ACCESS_LOGS_DIR=/opt/credit_tracker_docker/logs/access

3
docker_compose/docker-compose.yml
View file

@ -6,7 +6,7 @@ services:
volumes: volumes:
- ${LOGS_DIR}:/opt/app/logs/app - ${LOGS_DIR}:/opt/app/logs/app
- ${JSON_LOGS_DIR}:/opt/app/logs/json - ${JSON_LOGS_DIR}:/opt/app/logs/json
- ${REPORT_DIR}:/opt/app/reports - ${REPORT_MAIN_DIR}:/opt/app/reports
- ${ACCESS_LOGS_DIR}:/opt/app/logs/access - ${ACCESS_LOGS_DIR}:/opt/app/logs/access
ports: ports:
- "${HOST_PORT}:${SERVER_PORT}" - "${HOST_PORT}:${SERVER_PORT}"
@ -93,6 +93,7 @@ services:
container_name: credit-tracker-monitoring container_name: credit-tracker-monitoring
restart: always restart: always
volumes: volumes:
- ${REPORT_MONITOR_DIR}:/opt/app/reports
- ${LOGS_DIR}:/opt/app/logs/app - ${LOGS_DIR}:/opt/app/logs/app
- ${JSON_LOGS_DIR}:/opt/app/logs/json - ${JSON_LOGS_DIR}:/opt/app/logs/json
environment: environment:

1
src/main/resources/mybatis/mapper/signal/PhonesMapMapper.xml
View file

@ -107,6 +107,7 @@
birth_dt, birth_dt,
now() now()
FROM src FROM src
order by phone
ON CONFLICT (phone) DO UPDATE ON CONFLICT (phone) DO UPDATE
SET fid = EXCLUDED.fid, SET fid = EXCLUDED.fid,
phone = EXCLUDED.phone, phone = EXCLUDED.phone,