diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-21 14:53:19 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-21 14:53:19 +0100 |
| commit | c9d425731dd0f2c07d1b884c5529f81cfbf4f63c (patch) | |
| tree | 9489ad813912e267c7bcfe361df46e862f29f5bb | |
| parent | 1da9cde6aed4d2dac15e97120607ee80aa84672d (diff) | |
| download | prosody-c9d425731dd0f2c07d1b884c5529f81cfbf4f63c.tar.gz prosody-c9d425731dd0f2c07d1b884c5529f81cfbf4f63c.zip | |
mod_storage_sql: Share SQL connections with same parameters across VirtualHosts (fixes #576)
| -rw-r--r-- | plugins/mod_storage_sql.lua | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 6efa676c..50d34a23 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -449,19 +449,25 @@ end function module.load() if prosody.prosodyctl then return; end + local engines = module:shared("/*/sql/connections"); local params = normalize_params(module:get_option("sql", default_params)); - engine = sql:create_engine(params, function (engine) - if module:get_option("sql_manage_tables", true) then - -- Automatically create table, ignore failure (table probably already exists) - -- FIXME: we should check in information_schema, etc. - create_table(); - -- Check whether the table needs upgrading - if upgrade_table(params, false) then - module:log("error", "Old database format detected. Please run: prosodyctl mod_%s upgrade", module.name); - return false, "database upgrade needed"; + engine = engines[sql.db2uri(params)]; + if not engine then + module:log("info", "Creating new engine"); + engine = sql:create_engine(params, function (engine) + if module:get_option("sql_manage_tables", true) then + -- Automatically create table, ignore failure (table probably already exists) + -- FIXME: we should check in information_schema, etc. + create_table(); + -- Check whether the table needs upgrading + if upgrade_table(params, false) then + module:log("error", "Old database format detected. Please run: prosodyctl mod_%s upgrade", module.name); + return false, "database upgrade needed"; + end end - end - end); + end); + engines[sql.db2uri(params)] = engine; + end module:provides("storage", driver); end |