# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1450284454 0
# Node ID f387fae9fb31d41268fcdcd952932f6a7af14292
# Parent  4b024f29e40d1b6ac5721ab8272f6a13f16d8713# Parent  990b4ddaf582fa10f8c44f0b78670a4381e3da0e
Merge 0.10->trunk

diff -r 4b024f29e40d -r f387fae9fb31 core/loggingmanager.lua
--- a/core/loggingmanager.lua	Sun Dec 13 21:22:26 2015 +0100
+++ b/core/loggingmanager.lua	Wed Dec 16 16:47:34 2015 +0000
@@ -26,6 +26,7 @@
 local prosody = prosody;
 
 _G.log = logger.init("general");
+prosody.log = logger.init("general");
 
 local _ENV = nil;
 
diff -r 4b024f29e40d -r f387fae9fb31 plugins/mod_storage_sql.lua
--- a/plugins/mod_storage_sql.lua	Sun Dec 13 21:22:26 2015 +0100
+++ b/plugins/mod_storage_sql.lua	Wed Dec 16 16:47:34 2015 +0000
@@ -417,7 +417,9 @@
 
 local function normalize_params(params)
 	if params.driver == "SQLite3" then
-		params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
+		if params.database ~= ":memory:" then
+			params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
+		end
 	end
 	assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified");
 	return params;
diff -r 4b024f29e40d -r f387fae9fb31 plugins/muc/muc.lib.lua
diff -r 4b024f29e40d -r f387fae9fb31 util/dependencies.lua
--- a/util/dependencies.lua	Sun Dec 13 21:22:26 2015 +0100
+++ b/util/dependencies.lua	Wed Dec 16 16:47:34 2015 +0000
@@ -137,25 +137,25 @@
 
 local function log_warnings()
 	if _VERSION > "Lua 5.1" then
-		log("warn", "Support for %s is experimental, please report any issues", _VERSION);
+		prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION);
 	end
 	local ssl = softreq"ssl";
 	if ssl then
 		local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)");
 		if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then
-			log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
+			prosody.log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
 		end
 	end
 	local lxp = softreq"lxp";
 	if lxp then
 		if not pcall(lxp.new, { StartDoctypeDecl = false }) then
-			log("error", "The version of LuaExpat on your system leaves Prosody "
+			prosody.log("error", "The version of LuaExpat on your system leaves Prosody "
 				.."vulnerable to denial-of-service attacks. You should upgrade to "
 				.."LuaExpat 1.3.0 or higher as soon as possible. See "
 				.."http://prosody.im/doc/depends#luaexpat for more information.");
 		end
 		if not lxp.new({}).getcurrentbytecount then
-			log("error", "The version of LuaExpat on your system does not support "
+			prosody.log("error", "The version of LuaExpat on your system does not support "
 				.."stanza size limits, which may leave servers on untrusted "
 				.."networks (e.g. the internet) vulnerable to denial-of-service "
 				.."attacks. You should upgrade to LuaExpat 1.3.0 or higher as "
diff -r 4b024f29e40d -r f387fae9fb31 util/uuid.lua