aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-17 11:57:01 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-17 11:57:01 +0100
commit08ace7b7890a0c19a5cd5cf155df25e95d47e44a (patch)
treed5632da080555b929180dc818f51b49d69918ab2 /prosody
parent93fbb53acdb0e7ecd7d8745ca514417b3fde1e6f (diff)
parentcfb093a9f4e464fba1e56c2e3e340ece4219a411 (diff)
downloadprosody-08ace7b7890a0c19a5cd5cf155df25e95d47e44a.tar.gz
prosody-08ace7b7890a0c19a5cd5cf155df25e95d47e44a.zip
Merge 0.7/MattJ with 0.7
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody6
1 files changed, 5 insertions, 1 deletions
diff --git a/prosody b/prosody
index c7f91456..e4e82105 100755
--- a/prosody
+++ b/prosody
@@ -143,6 +143,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
@@ -331,7 +335,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
eventmanager.fire_event("server-starting");
prosody.events.fire_event("server-starting");