yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-18 21:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Requested change

Browse Source
This commit is contained in:
Paolo Ragone 2019-01-17 22:24:09 +13:00
parent c72e4bd1e5
commit 239835f0ae
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/strapi-hook-knex/lib/index.js
View File

@ -91,25 +91,25 @@ module.exports = strapi => {
password: _.get(connection.settings, 'password'), password: _.get(connection.settings, 'password'),
database: _.get(connection.settings, 'database'), database: _.get(connection.settings, 'database'),
charset: _.get(connection.settings, 'charset'), charset: _.get(connection.settings, 'charset'),
schema: _.get(connection.settings, 'schema') || 'public', schema: _.get(connection.settings, 'schema', 'public'),
port: _.get(connection.settings, 'port'), port: _.get(connection.settings, 'port'),
socket: _.get(connection.settings, 'socketPath'), socket: _.get(connection.settings, 'socketPath'),
ssl: _.get(connection.settings, 'ssl') || false, ssl: _.get(connection.settings, 'ssl', false),
timezone: _.get(connection.settings, 'timezone') || 'utc', timezone: _.get(connection.settings, 'timezone', 'utc'),
}, },
debug: _.get(connection.options, 'debug') || false, debug: _.get(connection.options, 'debug', false),
acquireConnectionTimeout: _.get(connection.options, 'acquireConnectionTimeout'), acquireConnectionTimeout: _.get(connection.options, 'acquireConnectionTimeout'),
migrations: _.get(connection.options, 'migrations') migrations: _.get(connection.options, 'migrations')
}, strapi.config.hook.settings.knex); }, strapi.config.hook.settings.knex);
options.pool = { options.pool = {
min: _.get(connection.options, 'pool.min') || 0, min: _.get(connection.options, 'pool.min', 0),
max: _.get(connection.options, 'pool.max') || 10, max: _.get(connection.options, 'pool.max', 10),
acquireTimeoutMillis: _.get(connection.options, 'pool.acquireTimeoutMillis') || 2000, acquireTimeoutMillis: _.get(connection.options, 'pool.acquireTimeoutMillis', 2000),
createTimeoutMillis: _.get(connection.options, 'pool.createTimeoutMillis') || 2000, createTimeoutMillis: _.get(connection.options, 'pool.createTimeoutMillis', 2000),
idleTimeoutMillis: _.get(connection.options, 'pool.idleTimeoutMillis') || 30000, idleTimeoutMillis: _.get(connection.options, 'pool.idleTimeoutMillis', 30000),
reapIntervalMillis: _.get(connection.options, 'pool.reapIntervalMillis') || 1000, reapIntervalMillis: _.get(connection.options, 'pool.reapIntervalMillis', 1000),
createRetryIntervalMillis: _.get(connection.options, 'pool.createRetryIntervalMillis') || 200, createRetryIntervalMillis: _.get(connection.options, 'pool.createRetryIntervalMillis', 200),
}; };
if (options.client === 'pg') { if (options.client === 'pg') {