Diff

core/storagemanager.lua @ 7950:f91e7ec9654e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Mar 2017 01:14:32 +0100
parent 7647:e9d7a409e236
parent 7947:24170d74b00b
child 7999:980606856882
line wrap: on
line diff
--- a/core/storagemanager.lua	Fri Mar 03 11:52:22 2017 +0100
+++ b/core/storagemanager.lua	Mon Mar 06 01:14:32 2017 +0100
@@ -72,7 +72,8 @@
 		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 @@
 				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