From 763ae779ffb43ea9d33a9bf2a1c6c4ca78ef243d Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 29 Apr 2008 14:50:27 +0000 Subject: From: Dr Scofield * Fixes the admin_shutdown xmlrpc method * Adds a share/python/console/shutdown.py script for shutting down a background OpenSim * For more details see http://xyzzyxyzzy.net/2008/04/29/console-less-opensim/ * There should also be instructions in the opensimulator wiki soon as well --- OpenSim/Region/Application/Application.cs | 1 - OpenSim/Region/Application/OpenSimMain.cs | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 828490a..bdce0f0 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -83,7 +83,6 @@ namespace OpenSim if (background) { - Console.WriteLine("background mode"); OpenSimMain sim = new OpenSimMain(configSource); sim.StartUp(); } diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 3bee7f3..d05a632 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -323,15 +323,19 @@ namespace OpenSim // // Called from app startup (OpenSim.Application) // - - m_log.Info("[OPENSIM]: Starting Opensim"); - m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid")); + m_log.Info("===================================================================="); + m_log.Info("========================= STARTING OPENSIM ========================="); + m_log.Info("===================================================================="); + m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid"); InternalStartUp(); // We are done with startup - m_log.Info("[OPENSIM MAIN]: Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)"); + m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}", + m_udpServers.Count.ToString(), m_udpServers.Count > 1 ? "s" : ""); WorldHasComeToAnEnd.WaitOne(); + m_log.Info("[OPENSIM MAIN]: Shutdown complete, goodbye."); + Environment.Exit(0); } @@ -684,7 +688,7 @@ namespace OpenSim public virtual void Shutdown() { InternalShutdown(); - Environment.Exit(0); + ApocalypseNow(); } /// -- cgit v1.1