From 071d7169495bcf26cdd342ec7543f1731c16de22 Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Tue, 24 Aug 2021 16:45:09 +0100 Subject: [PATCH 1/2] Initial Fix --- app/init.php | 4 +++- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/init.php b/app/init.php index 0dd043bba..fcea4cb15 100644 --- a/app/init.php +++ b/app/init.php @@ -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; diff --git a/docker-compose.yml b/docker-compose.yml index 86b1e4dc2..eef722688 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: From 667a875b4994d209dd67c90c138d7e294923ed77 Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Tue, 24 Aug 2021 16:56:12 +0100 Subject: [PATCH 2/2] Update compose.phtml --- app/views/install/compose.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 95e33b9ea..64df401e0 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -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