From d27940fd2fe09daf1ce82797e0621ed31a19d1ca Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 20 Jun 2009 14:35:31 +0500 Subject: Main: Don't use empty event data objects for some global events. Some handlers don't expect it. --- prosody | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/prosody b/prosody index 2f0eacb0..0fd0b735 100755 --- a/prosody +++ b/prosody @@ -144,7 +144,7 @@ end); -- Function to reload the config file function prosody.reload_config() log("info", "Reloading configuration file"); - prosody.events.fire_event("reloading-config", {}); + prosody.events.fire_event("reloading-config"); local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua"); if not ok then if level == "parser" then @@ -159,7 +159,7 @@ end function prosody.reopen_logfiles() log("info", "Re-opening log files"); eventmanager.fire_event("reopen-log-files"); -- Handled by appropriate log sinks - prosody.events.fire_event("reopen-log-files", {}); + prosody.events.fire_event("reopen-log-files"); end -- Function to initiate prosody shutdown @@ -171,7 +171,7 @@ end -- Signal to modules that we are ready to start eventmanager.fire_event("server-starting"); -prosody.events.fire_event("server-starting", {}); +prosody.events.fire_event("server-starting"); -- Load SSL settings from config, and create a ctx table local global_ssl_ctx = ssl and config.get("*", "core", "ssl"); @@ -229,7 +229,7 @@ end prosody.lock_globals(); eventmanager.fire_event("server-started"); -prosody.events.fire_event("server-started", {}); +prosody.events.fire_event("server-started"); -- Error handler for errors that make it this far local function catch_uncaught_error(err) @@ -251,7 +251,7 @@ while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do end log("info", "Shutdown status: Cleaning up"); -prosody.events.fire_event("server-cleanup", {}); +prosody.events.fire_event("server-cleanup"); -- Ok, we're quitting I know, but we -- need to do some tidying before we go :) @@ -287,5 +287,5 @@ server.closeall(); server.setquitting(true); eventmanager.fire_event("server-stopped"); -prosody.events.fire_event("server-stopped", {}); +prosody.events.fire_event("server-stopped"); log("info", "Shutdown status: Complete!"); -- cgit v1.2.3