aboutsummaryrefslogtreecommitdiffstats
path: root/core/storagemanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-06 01:14:32 +0100
committerKim Alvefur <zash@zash.se>2017-03-06 01:14:32 +0100
commit0e71fac1d18b0de0e9203cb6b71c971d55c8c70c (patch)
treee58db2bf464bf09301a9c02c27330c2dba6b926d /core/storagemanager.lua
parent2ca03f1a40ea0854e0dda798b82e31c558eed578 (diff)
parent91d2b2518f3e3d047dc43f59db3f7025d29ab86c (diff)
downloadprosody-0e71fac1d18b0de0e9203cb6b71c971d55c8c70c.tar.gz
prosody-0e71fac1d18b0de0e9203cb6b71c971d55c8c70c.zip
Merge 0.10->trunk
Diffstat (limited to 'core/storagemanager.lua')
-rw-r--r--core/storagemanager.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index f0450dfb..f1b70615 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -72,7 +72,8 @@ local function get_storage_config(host)
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");
+ 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
@@ -180,7 +181,8 @@ local function purge(user, host)
if driver.purge then
purged[driver_name] = driver:purge(user);
else
- log("warn", "Storage driver %s does not support removing all user data, you may need to delete it manually", driver_name);
+ log("warn", "Storage driver %s does not support removing all user data, "
+ .."you may need to delete it manually", driver_name);
end
end
end