Merge 0.10->trunk

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index e21e3901647a7da25a627718d798be2811f98386..15d2ee3c468bb7c5db356518270d35cbb94029f9 100644 (file)
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -26,6 +26,7 @@ local logger = require "util.logger";
 local prosody = prosody;
 
 _G.log = logger.init("general");
+prosody.log = logger.init("general");
 
 local _ENV = nil;
 

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index adf9f9b6a50d5282b6c0d6e717d472419e7827ff..57d964e277b2a160411c8c5b882b5bfeb4f357dd 100644 (file)
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -417,7 +417,9 @@ end
 
 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 --git a/util/dependencies.lua b/util/dependencies.lua
index 5e3b03d833c63c8723b5853053a2cfed16439557..9ab4076517cb58a477fe6ead86690849b846e9d5 100644 (file)
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -137,25 +137,25 @@ end
 
 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 "