aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2022-07-26 00:39:16 +0200
committerKim Alvefur <zash@zash.se>2022-07-26 00:39:16 +0200
commit9f51add3a83cd0bbc6c765ce08cda1a4a42fc8a2 (patch)
tree36397f674eea1a16250b73a1fd19621a454a8951
parent814817ebf21306625268dbacba88eb4f539b1626 (diff)
downloadprosody-9f51add3a83cd0bbc6c765ce08cda1a4a42fc8a2.tar.gz
prosody-9f51add3a83cd0bbc6c765ce08cda1a4a42fc8a2.zip
mod_storage_sql: Fix bypass of load procedure under prosodyctl
There's no 'prosody.prosodyctl' property other than this one, introduced in 6216743c188c in 2015. Guessing that the intent was to skip this when running as a prosodyctl command. The module.command code does its own version of this initialization, so this seems likely. Thanks raja for noticing
-rw-r--r--plugins/mod_storage_sql.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 3bfe1739..448eaa2d 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -833,7 +833,7 @@ local function normalize_params(params)
end
function module.load()
- if prosody.prosodyctl then return; end
+ 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);