aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2022-12-29 18:28:50 +0100
committerKim Alvefur <zash@zash.se>2022-12-29 18:28:50 +0100
commite9a7490f670207b323a5d2ea79c4eedcf629a7fb (patch)
tree154772c44f2f0944a977b6b54d3381103e9481f6
parent23a4d716ac6fc219f518a529250e9e8c3316bea3 (diff)
parent2317f6a09f386512a16fc4df0e05679456136a22 (diff)
downloadprosody-e9a7490f670207b323a5d2ea79c4eedcf629a7fb.tar.gz
prosody-e9a7490f670207b323a5d2ea79c4eedcf629a7fb.zip
Merge 0.12->trunk
-rw-r--r--plugins/mod_storage_sql.lua1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index eb335d6b..938e838e 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -831,7 +831,6 @@ local function normalize_params(params)
end
function module.load()
- if prosody.process_type == "prosodyctl" then return; end
local engines = module:shared("/*/sql/connections");
local params = normalize_params(module:get_option("sql", default_params));
local db_uri = sql.db2uri(params);