CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-03 03:14:50 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feat-database-indexing' into feat-usage-daemon

Browse source
This commit is contained in:
Damodar Lohani 2021-08-25 11:36:11 +05:45
parent 80fffe0ed4 48360e2805
commit 1007756731
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

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

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

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

2
docker-compose.yml
View file

@ -410,7 +410,7 @@ services:
- MYSQL_DATABASE=${_APP_DB_SCHEMA} - MYSQL_DATABASE=${_APP_DB_SCHEMA}
- MYSQL_USER=user - MYSQL_USER=user
- MYSQL_PASSWORD=${_APP_DB_PASS} - 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 # 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: # smtp: