aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-29 14:50:27 +0000
committerJustin Clarke Casey2008-04-29 14:50:27 +0000
commit763ae779ffb43ea9d33a9bf2a1c6c4ca78ef243d (patch)
treeade4e916a83e25d286c9e2cf95721bf5b366910e /OpenSim/Region/Application
parentCommitting Dee100's balance update patch with a few bug fixes and a twist. Th... (diff)
downloadopensim-SC_OLD-763ae779ffb43ea9d33a9bf2a1c6c4ca78ef243d.zip
opensim-SC_OLD-763ae779ffb43ea9d33a9bf2a1c6c4ca78ef243d.tar.gz
opensim-SC_OLD-763ae779ffb43ea9d33a9bf2a1c6c4ca78ef243d.tar.bz2
opensim-SC_OLD-763ae779ffb43ea9d33a9bf2a1c6c4ca78ef243d.tar.xz
From: Dr Scofield <hud@zurich.ibm.com>
* 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
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs14
2 files changed, 9 insertions, 6 deletions
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
83 83
84 if (background) 84 if (background)
85 { 85 {
86 Console.WriteLine("background mode");
87 OpenSimMain sim = new OpenSimMain(configSource); 86 OpenSimMain sim = new OpenSimMain(configSource);
88 sim.StartUp(); 87 sim.StartUp();
89 } 88 }
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
323 // 323 //
324 // Called from app startup (OpenSim.Application) 324 // Called from app startup (OpenSim.Application)
325 // 325 //
326 326 m_log.Info("====================================================================");
327 m_log.Info("[OPENSIM]: Starting Opensim"); 327 m_log.Info("========================= STARTING OPENSIM =========================");
328 m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid")); 328 m_log.Info("====================================================================");
329 m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid");
329 330
330 InternalStartUp(); 331 InternalStartUp();
331 332
332 // We are done with startup 333 // We are done with startup
333 m_log.Info("[OPENSIM MAIN]: Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)"); 334 m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",
335 m_udpServers.Count.ToString(), m_udpServers.Count > 1 ? "s" : "");
334 WorldHasComeToAnEnd.WaitOne(); 336 WorldHasComeToAnEnd.WaitOne();
337 m_log.Info("[OPENSIM MAIN]: Shutdown complete, goodbye.");
338 Environment.Exit(0);
335 } 339 }
336 340
337 341
@@ -684,7 +688,7 @@ namespace OpenSim
684 public virtual void Shutdown() 688 public virtual void Shutdown()
685 { 689 {
686 InternalShutdown(); 690 InternalShutdown();
687 Environment.Exit(0); 691 ApocalypseNow();
688 } 692 }
689 693
690 /// <summary> 694 /// <summary>