Skip to content

Commit 3495492

Browse files
authored
add mysql timeout env (#4584)
1 parent e3789b6 commit 3495492

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

.env

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,14 @@ MYSQL_QUERY_CACHE_SIZE=64M
522522
# @run
523523
MYSQL_KEY_BUFFER_SIZE=128M
524524

525+
# Value applied to "connect_timeout" MySQL server setting.
526+
# @run
527+
MYSQL_CONNECT_TIMEOUT=60
528+
529+
# Value applied to "wait_timeout" MySQL server setting.
530+
# @run
531+
MYSQL_WAIT_TIMEOUT=600
532+
525533
# This Environment variable will run mariadb-upgrade is essential when mariadb version changes.
526534
# @run
527535
MARIADB_AUTO_UPGRADE=1

docker-compose.altenatives.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ services:
2424
- MYSQL_QUERY_CACHE_LIMIT
2525
- MYSQL_QUERY_CACHE_SIZE
2626
- MYSQL_KEY_BUFFER_SIZE
27+
- MYSQL_CONNECT_TIMEOUT
28+
- MYSQL_WAIT_TIMEOUT
2729
volumes:
2830
- ${PHRASEANET_DB_DIR}_mysql8:/var/lib/mysql:rw
2931
networks:

docker-compose.datastores.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ services:
1515
- MYSQL_QUERY_CACHE_LIMIT
1616
- MYSQL_QUERY_CACHE_SIZE
1717
- MYSQL_KEY_BUFFER_SIZE
18+
- MYSQL_CONNECT_TIMEOUT
19+
- MYSQL_WAIT_TIMEOUT
1820
- MARIADB_AUTO_UPGRADE
1921
volumes:
2022
- ${PHRASEANET_DB_DIR}:/var/lib/mysql

docker/db/docker/custom.cnf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ slow_query_log=$MYSQL_SLOW_QUERY_LOG
1010
query_cache_limit=$MYSQL_QUERY_CACHE_LIMIT
1111
query_cache_size=$MYSQL_QUERY_CACHE_SIZE
1212

13-
key_buffer_size=$MYSQL_KEY_BUFFER_SIZE
13+
key_buffer_size=$MYSQL_KEY_BUFFER_SIZE
14+
15+
connect_timeout=$MYSQL_CONNECT_TIMEOUT
16+
wait_timeout=$MYSQL_WAIT_TIMEOUT

0 commit comments

Comments
 (0)