aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-05-02 20:32:17 +0100
committerMatthew Wild <mwild1@gmail.com>2009-05-02 20:32:17 +0100
commitcdefe721448365b25bf3217bbbdd25c04b3a7091 (patch)
treefd1abba4c68ecca53110db19266587ad74276507
parent3163adb138ae8b1e1e4144a567e4619dcef7893c (diff)
downloadprosody-cdefe721448365b25bf3217bbbdd25c04b3a7091.tar.gz
prosody-cdefe721448365b25bf3217bbbdd25c04b3a7091.zip
prosody: Define prosody_shutdown() before emitting the server-starting event
-rwxr-xr-xprosody16
1 files changed, 9 insertions, 7 deletions
diff --git a/prosody b/prosody
index 9bff11cc..b0bc579b 100755
--- a/prosody
+++ b/prosody
@@ -114,8 +114,17 @@ end);
----------- End of out-of-place code --------------
+-- Global function to initiate prosody shutdown
+function prosody_shutdown(reason)
+ log("info", "Shutting down: %s", reason or "unknown reason");
+ eventmanager.fire_event("server-stopping", { reason = reason });
+ server.setquitting(true);
+end
+
+-- Signal to modules that we are ready to start
eventmanager.fire_event("server-starting");
+-- Load SSL settings from config, and create a ctx table
local global_ssl_ctx = ssl and config.get("*", "core", "ssl");
if global_ssl_ctx then
local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
@@ -153,13 +162,6 @@ if cl.get("console") then
cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" })
end
--- Global function to initiate prosody shutdown
-function prosody_shutdown(reason)
- log("info", "Shutting down: %s", reason or "unknown reason");
- eventmanager.fire_event("server-stopping", { reason = reason });
- server.setquitting(true);
-end
-
-- Catch global accesses --
local locked_globals_mt = { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }