CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-05-19 04:02:34 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1510 from PineappleIOnic/fix-sql-timeout

Browse source 
Initial Fix
This commit is contained in:
Eldad A. Fux 2021-08-24 19:25:40 +03:00 committed by GitHub
parent 088ccb955d 667a875b49
commit 6ccfcd061d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/init.php
View file

@ -166,7 +166,6 @@ $register->set('dbPool', function () { // Register DB connection
$dbPass = App::getEnv('_APP_DB_PASS', '');
$dbScheme = App::getEnv('_APP_DB_SCHEMA', '');
$pool = new PDOPool((new PDOConfig())
->withHost($dbHost)
->withPort($dbPort)
@ -174,6 +173,9 @@ $register->set('dbPool', function () { // Register DB connection
->withCharset('utf8mb4')
->withUsername($dbUser)
->withPassword($dbPass)
->withOptions([
PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT, // If in production mode, warnings are not displayed
])
, 16);
return $pool;

2
app/views/install/compose.phtml
View file

@ -342,7 +342,7 @@ services:
- MYSQL_DATABASE=${_APP_DB_SCHEMA}
- MYSQL_USER=${_APP_DB_USER}
- MYSQL_PASSWORD=${_APP_DB_PASS}
command: 'mysqld --innodb-flush-method=fsync --wait_timeout=86400'
command: 'mysqld --innodb-flush-method=fsync'
redis:
image: redis:6.0-alpine3.12

2
docker-compose.yml
View file

@ -397,7 +397,7 @@ services:
- MYSQL_DATABASE=${_APP_DB_SCHEMA}
- MYSQL_USER=${_APP_DB_USER}
- MYSQL_PASSWORD=${_APP_DB_PASS}
command: 'mysqld --innodb-flush-method=fsync --wait_timeout=86400' # add ' --query_cache_size=0' for DB tests
command: 'mysqld --innodb-flush-method=fsync' # add ' --query_cache_size=0' for DB tests
# command: mv /var/lib/mysql/ib_logfile0 /var/lib/mysql/ib_logfile0.bu && mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu
# smtp: