mirror of
https://github.com/bjc/prosody.git
synced 2025-04-04 13:47:41 +03:00
Merge 0.12->trunk
This commit is contained in:
commit
7c8dd7ee42
3 changed files with 33 additions and 2 deletions
|
@ -832,7 +832,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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue