From fbaeb081aa6e66cd560c2883c4a514f489c2e3e8 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sun, 1 Jun 2008 02:02:20 +0000
Subject: * Move most bookending startup/shutdown messages to BaseOpenSimServer
 so they appear in non-console servers too

---
 OpenSim/Framework/Console/ConsoleBase.cs       |  7 -------
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 13 ++++++-------
 OpenSim/Grid/AssetServer/Main.cs               | 15 ---------------
 OpenSim/Region/Application/Application.cs      |  2 --
 4 files changed, 6 insertions(+), 31 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 74e64e3..5d8e5b9 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -48,13 +48,6 @@ namespace OpenSim.Framework.Console
         {
             m_componentName = componentname;
             m_cmdParser = cmdparser;
-
-            m_log.Info("[" + m_componentName + "]: Started at " + DateTime.Now.ToString());
-        }
-
-        public void Close()
-        {
-            m_log.Info("[" + m_componentName + "]: Shutdown at " + DateTime.Now.ToString());
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index dfc9c0a..f8e97b1 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -74,21 +74,20 @@ namespace OpenSim.Framework.Servers
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
         public virtual void Startup()
-        {                                
+        {   
+            m_log.Info("[STARTUP]: Beginning startup processing");
+            
             EnhanceVersionInformation();
             
             m_log.Info("[STARTUP]: Version " + m_version + "\n");
         }
 
         /// <summary>
-        /// Should be overriden by descendents if they need to perform extra shutdown processing
+        /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
         /// </summary>
         public virtual void Shutdown()
-        {
-            if (m_console != null)
-            {
-                m_console.Close();
-            }
+        {          
+            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
             
             Environment.Exit(0);
         }
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index a118a90..7053f72 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -60,8 +60,6 @@ namespace OpenSim.Grid.AssetServer
         {
             XmlConfigurator.Configure();
 
-            m_log.Info("Starting...\n");
-
             assetserver = new OpenAsset_Main();
             assetserver.Startup();
 
@@ -175,18 +173,5 @@ namespace OpenSim.Grid.AssetServer
         {
             m_assetProvider.CreateAsset(asset);
         }
-
-        public override void RunCmd(string cmd, string[] cmdparams)
-        {
-            base.RunCmd(cmd, cmdparams);
-
-            switch (cmd)
-            {
-                case "shutdown":
-                    m_console.Close();
-                    Environment.Exit(0);
-                    break;
-            }
-        }
     }
 }
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 9be30e9..32dff0f 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -58,8 +58,6 @@ namespace OpenSim
                 Console.WriteLine(" Environment is unsupported (" + supported + ")\n");
             }
 
-            Console.WriteLine("Starting...\n");
-
             Culture.SetCurrentCulture();
 
             ArgvConfigSource configSource = new ArgvConfigSource(args);
-- 
cgit v1.1