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 ++++++-------
2 files changed, 6 insertions(+), 14 deletions(-)
(limited to 'OpenSim/Framework')
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());
}
///
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.
///
public virtual void Startup()
- {
+ {
+ m_log.Info("[STARTUP]: Beginning startup processing");
+
EnhanceVersionInformation();
m_log.Info("[STARTUP]: Version " + m_version + "\n");
}
///
- /// 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
///
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);
}
--
cgit v1.1