Skip to content

Commit 01095a1

Browse files
stabilized server startup and loss of connections to the database
1 parent 3f4c873 commit 01095a1

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

docker/prepare

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
22

3+
# wait for mysql
4+
sleep 3
5+
36
#shell
47
mv /app/game/config/default-ipconfig.xml /app/game/config/ipconfig.xml
58

@@ -21,4 +24,7 @@ for sql_file in /app/db_installer/sql/game/*.sql; do
2124
fi
2225
done
2326

24-
mysql -uroot -hlocalhost -e "truncate announcements;"
27+
mysql -uroot -hlocalhost l2jmobiusessence -e "truncate announcements;"
28+
29+
# ready
30+
touch /app/ready

docker/supervisor/conf.d/game.conf

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
[group:java_GameServerTask]
2-
programs=java_GameServerTask
1+
[group:GameServerTask]
2+
programs=GameServerTask
33
priority=20
44

5-
[program:java_GameServerTask]
6-
command=/bin/bash -c "sleep 5 && java -Djava.awt.headless=true $(cat "java.cfg") -jar ../libs/GameServer.jar"
5+
[program:GameServerTask]
6+
command=/bin/bash -c "[ -f /app/ready ] && sleep 10 && java -Djava.awt.headless=true $(cat "java.cfg") -jar ../libs/GameServer.jar"
77
directory=/app/game
88
autostart=true
99
autorestart=true
10-
startsecs = 1
10+
startretries=9999
11+
startsecs = 20
1112
stdout_logfile = /dev/stdout
1213
stdout_logfile_maxbytes = 0
1314
stderr_logfile = /dev/stderr
1415
stderr_logfile_maxbytes = 0
1516
user=root
16-
# environment=JAVA_HOME=/usr/local/openjdk-21

docker/supervisor/conf.d/login.conf

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
[group:java_LoginServerTask]
2-
programs=java_LoginServerTask
1+
[group:LoginServerTask]
2+
programs=LoginServerTask
33
priority=20
44

5-
[program:java_LoginServerTask]
6-
command=/bin/bash -c "sleep 5 && java -Djava.awt.headless=true $(cat "java.cfg") -jar ../libs/LoginServer.jar"
5+
[program:LoginServerTask]
6+
command=/bin/bash -c "[ -f /app/ready ] && java -Djava.awt.headless=true $(cat "java.cfg") -jar ../libs/LoginServer.jar"
77
directory=/app/login
88
autostart=true
99
autorestart=true
10+
startretries=9999
1011
startsecs = 1
1112
stdout_logfile = /dev/stdout
1213
stdout_logfile_maxbytes = 0
1314
stderr_logfile = /dev/stderr
1415
stderr_logfile_maxbytes = 0
1516
user=root
16-
# environment=JAVA_HOME=/usr/local/openjdk-21

docker/supervisor/conf.d/mariadb.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ programs=mariadb
33
priority=20
44

55
[program:mariadb]
6-
command=/usr/sbin/mysqld --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --port=3306
6+
command=/usr/sbin/mysqld --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --port=3306 --max-connections=1000 --wait-timeout=600
77
autostart=true
88
autorestart=true
9-
startsecs = 1
9+
startsecs = 4
1010
stdout_logfile = /dev/stdout
1111
stdout_logfile_maxbytes = 0
1212
stderr_logfile = /dev/stderr
File renamed without changes.

example/localhost/L2.ini

4.55 KB
Binary file not shown.

0 commit comments

Comments
 (0)