不要怂,就是干,撸起袖子干!

Commit 2129f078 by Sascha Depold

keep the original pooling config for transactions. fixes #1262

1 parent 8ed1bc3e
......@@ -5,6 +5,7 @@ var sqlite3
module.exports = (function() {
var ConnectorManager = function(sequelize, config) {
this.sequelize = sequelize
this.config = config
if (config.dialectModulePath) {
sqlite3 = require(config.dialectModulePath).verbose()
......
......@@ -18,7 +18,14 @@ TransactionManager.prototype.getConnectorManager = function(uuid) {
var config = Utils._.extend({ uuid: uuid }, this.sequelize.config)
if (uuid !== 'default') {
config.pool = { maxConnections: 0, useReplicaton: false }
config.pool = Utils._.extend(
{},
Utils._.clone(config.pool || {}),
{
maxConnections: 0,
useReplicaton: false
}
)
config.keepDefaultTimezone = true
}
......
......@@ -21,7 +21,7 @@ module.exports = {
port: process.env.SEQ_MYSQL_PORT || process.env.SEQ_PORT || 3306,
pool: {
maxConnections: process.env.SEQ_MYSQL_POOL_MAX || process.env.SEQ_POOL_MAX || 5,
maxIdleTime: process.env.SEQ_MYSQL_POOL_IDLE || process.env.SEQ_POOL_IDLE || 30
maxIdleTime: process.env.SEQ_MYSQL_POOL_IDLE || process.env.SEQ_POOL_IDLE || 3000
}
},
......@@ -47,7 +47,7 @@ module.exports = {
host: process.env.SEQ_MYSQL_HOST || process.env.SEQ_HOST || '127.0.0.1',
port: process.env.SEQ_MYSQL_PORT || process.env.SEQ_PORT || 3306,
pool: {
maxConnections: process.env.SEQ_MYSQL_POOL_MAX || process.env.SEQ_POOL_MAX || 1,
maxConnections: process.env.SEQ_MYSQL_POOL_MAX || process.env.SEQ_POOL_MAX || 5,
maxIdleTime: process.env.SEQ_MYSQL_POOL_IDLE || process.env.SEQ_POOL_IDLE || 3000
}
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!