CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix debugging and allow extended timeouts

Browse Source
This commit is contained in:
okx-code
2024-09-04 01:02:49 +01:00
parent 6079dcb1f4
commit c7802819eb
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/files/paper-config/spigot.yml
View File

@@ -18,7 +18,7 @@ settings:
save-user-cache-on-stop-only: false save-user-cache-on-stop-only: false
moved-wrongly-threshold: 1.0625 moved-wrongly-threshold: 1.0625
moved-too-quickly-multiplier: 50.0 moved-too-quickly-multiplier: 50.0
timeout-time: ${WATCHDOG_TIMEOUT_TIME} timeout-time: ${CIV_WATCHDOG_TIMEOUT_TIME}
restart-on-crash: false restart-on-crash: false
restart-script: ./start.sh restart-script: ./start.sh
netty-threads: 4 netty-threads: 4

2
ansible/files/proxy-config/config.yml
View File

@@ -19,7 +19,7 @@ permissions:
log_pings: true log_pings: true
connection_throttle_limit: 3 connection_throttle_limit: 3
prevent_proxy_connections: false prevent_proxy_connections: false
timeout: 30000 timeout: ${CIV_TIMEOUT_TIME}
player_limit: -1 player_limit: -1
ip_forward: true ip_forward: true
remote_ping_timeout: 5000 remote_ping_timeout: 5000

3
ansible/templates/stacks/minecraft.yml.j2
View File

@@ -28,6 +28,7 @@ services:
CIV_POSTGRES_HOST: minecraft_postgres CIV_POSTGRES_HOST: minecraft_postgres
CIV_POSTGRES_USERNAME: '{{secret.minecraft.postgres.username}}' CIV_POSTGRES_USERNAME: '{{secret.minecraft.postgres.username}}'
CIV_POSTGRES_PASSWORD: '{{secret.minecraft.postgres.password}}' CIV_POSTGRES_PASSWORD: '{{secret.minecraft.postgres.password}}'
CIV_TIMEOUT_TIME: 30000
deploy: deploy:
placement: placement:
constraints: [node.role == manager] constraints: [node.role == manager]
@@ -90,7 +91,7 @@ services:
CIV_RABBITMQ_USERNAME: rabbitmq CIV_RABBITMQ_USERNAME: rabbitmq
CIV_RABBITMQ_PASSWORD: '{{secret.minecraft.rabbitmq.password}}' CIV_RABBITMQ_PASSWORD: '{{secret.minecraft.rabbitmq.password}}'
WATCHDOG_TIMEOUT_TIME: 60 CIV_WATCHDOG_TIMEOUT_TIME: 60
volumes: volumes:
# Persistence # Persistence

4
docker-compose.yml
View File

@@ -29,6 +29,8 @@ services:
CIV_POSTGRES_HOST: postgres CIV_POSTGRES_HOST: postgres
CIV_POSTGRES_USERNAME: postgres CIV_POSTGRES_USERNAME: postgres
CIV_POSTGRES_PASSWORD: postgres CIV_POSTGRES_PASSWORD: postgres
CIV_TIMEOUT_TIME: 3000000
ports: ports:
- "25565:25577" - "25565:25577"
volumes: volumes:
@@ -80,7 +82,7 @@ services:
CIV_RABBITMQ_PASSWORD: rabbitmq CIV_RABBITMQ_PASSWORD: rabbitmq
JVM_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 JVM_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
WATCHDOG_TIMEOUT_TIME: 6000 CIV_WATCHDOG_TIMEOUT_TIME: 6000
ports: ports:
- "5005:5005" - "5005:5005"
volumes: volumes: