mod_saslauth: Add return value and error message to the Cyrus SASL handle_status...

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 8e96eb46ac88d1cfdc42bf146a0570928686bd17..517762f3c438d4d7061739f7a8f3ec95e86d3175 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -144,6 +144,10 @@ function set_function_metatable()
                        debug.setupvalue(f, i, value);
                end
        end
+       function mt.__tostring(f)
+               local info = debug.getinfo(f);
+               return ("function(%s:%d)"):format(info.short_src:match("[^\\/]*$"), info.linedefined);
+       end
        debug.setmetatable(function() end, mt);
 end
 
@@ -281,6 +285,7 @@ end
 function load_secondary_libraries()
        --- Load and initialise core modules
        require "util.import"
+       require "util.xmppstream"
        require "core.xmlhandlers"
        require "core.rostermanager"
        require "core.hostmanager"
@@ -324,7 +329,7 @@ function init_data_store()
 end
 
 function prepare_to_start()
-       log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
+       log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
        -- Signal to modules that we are ready to start
        prosody.events.fire_event("server-starting");