From 50945d24e0e8d256221276534d5f90f643c0fc85 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 2 May 2009 16:58:40 +0100 Subject: prosody: Don't require console_enabled option anymore --- prosody | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'prosody') diff --git a/prosody b/prosody index 5f1b49b6..f00fffad 100755 --- a/prosody +++ b/prosody @@ -149,12 +149,8 @@ net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "t net_activate_ports("s2s", "xmppserver", {5269}, "tcp"); net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl"); -if config.get("*", "core", "console_enabled") then - if cl.get("console") then - cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" }) - else - log("error", "Console is enabled, but the console module appears not to be loaded"); - end +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 -- cgit v1.2.3 From 2ced82baeee220c7aac9e0816c7f05b13575474f Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 2 May 2009 17:01:21 +0100 Subject: prosody: Add log messages during shutdown sequence to indicate progress --- prosody | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'prosody') diff --git a/prosody b/prosody index f00fffad..9bff11cc 100755 --- a/prosody +++ b/prosody @@ -195,6 +195,7 @@ while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do socket.sleep(0.2); end +log("info", "Shutdown status: Cleaning up"); eventmanager.fire_event("server-cleanup"); -- Ok, we're quitting I know, but we @@ -202,6 +203,7 @@ eventmanager.fire_event("server-cleanup"); server.setquitting(false); for hostname, host in pairs(hosts) do + log("info", "Shutdown status: Closing client connections for %s", hostname) if host.sessions then for username, user in pairs(host.sessions) do for resource, session in pairs(user.sessions) do @@ -211,6 +213,7 @@ for hostname, host in pairs(hosts) do end end + log("info", "Shutdown status: Closing outgoing s2s connections from %s", hostname); if host.s2sout then for remotehost, session in pairs(host.s2sout) do if session.close then @@ -222,6 +225,10 @@ for hostname, host in pairs(hosts) do end end +log("info", "Shutdown status: Closing all server connections"); server.closeall(); +server.setquitting(true); + eventmanager.fire_event("server-stopped"); +log("info", "Shutdown status: Complete!"); -- cgit v1.2.3