aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-09-04 00:38:45 +0200
committerKim Alvefur <zash@zash.se>2023-09-04 00:38:45 +0200
commiteeaa713fda7927c885302b66f75ebe8b64531a01 (patch)
treebc82f5bf0ec0ee24d2e21744f7a72ad3f59bcecc
parentc6b9037235df00fe32bcef7c5377f739c02f61f2 (diff)
downloadprosody-eeaa713fda7927c885302b66f75ebe8b64531a01.tar.gz
prosody-eeaa713fda7927c885302b66f75ebe8b64531a01.zip
core.storagemanager: Remove 0.10 era sql2 driver COMPAT
Unlikely that anyone has had sql2 in their configs for a long time, so this serves little purpose. Leaving the indirection function in case some similar compat code is needed in the future.
-rw-r--r--core/storagemanager.lua20
1 files changed, 2 insertions, 18 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index 744f1e80..238c7612 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -91,24 +91,8 @@ local function load_driver(host, driver_name)
end
local function get_storage_config(host)
- -- 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;
+ -- Here used to be some some compat checks
+ return config.get(host, "storage");
end
local function get_driver(host, store)