diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-12-03 14:57:49 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-12-03 14:57:49 +0000 |
| commit | cf88b880cd19bd21161f6b3e8688fb752a96f64d (patch) | |
| tree | 113cfb25fd9e9b0ecac9b3dc71eb84516ebd8569 /core | |
| parent | 14f6ec5e010ad22137736a0aee9a935a6f437788 (diff) | |
| download | prosody-cf88b880cd19bd21161f6b3e8688fb752a96f64d.tar.gz prosody-cf88b880cd19bd21161f6b3e8688fb752a96f64d.zip | |
storagemanager, mod_storage_sql, mod_storage_sql2: Rename mod_storage_sql2 -> mod_storage_sql, mod_storage_sql -> mod_storage_sql1 (temporarily), and emit warning for configs using sql2
Diffstat (limited to 'core')
| -rw-r--r-- | core/storagemanager.lua | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua index 21f5fd1d..c312cf05 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -58,7 +58,23 @@ local function load_driver(host, driver_name) end local function get_storage_config(host) - return config.get(host, "storage"); + -- COMPAT w/ unreleased Prosody 0.10 and the once-experimental mod_storage_sql2 in peoples' config files + local storage_config = config.get(host, "storage"); + local found_sql2; + if storage_config == "sql2" then + storage_config, found_sql2 = "sql", true; + elseif type(storage_config) == "table" then + for store_name, driver_name in pairs(storage_config) do + if driver_name == "sql2" then + storage_config[store_name] = "sql"; + found_sql2 = true; + end + end + end + if found_sql2 then + log("error", "The temporary 'sql2' storage module has now been renamed to 'sql', please update your config file: https://prosody.im/doc/modules/mod_storage_sql2"); + end + return storage_config; end local function get_driver(host, store) |