OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Move most bookending startup/shutdown messages to BaseOpenSimServer so they appear in non-console servers too

0.6.0-stable
Justin Clarke Casey 2008-06-01 02:02:20 +00:00
parent 15d41c2fc2
commit fbaeb081aa
4 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -48,13 +48,6 @@ namespace OpenSim.Framework.Console
{ {
m_componentName = componentname; m_componentName = componentname;
m_cmdParser = cmdparser; 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> /// <summary>

13
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -74,21 +74,20 @@ namespace OpenSim.Framework.Servers
/// Performs initialisation of the scene, such as loading configuration from disk. /// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary> /// </summary>
public virtual void Startup() public virtual void Startup()
{ {
m_log.Info("[STARTUP]: Beginning startup processing");
EnhanceVersionInformation(); EnhanceVersionInformation();
m_log.Info("[STARTUP]: Version " + m_version + "\n"); m_log.Info("[STARTUP]: Version " + m_version + "\n");
} }
/// <summary> /// <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> /// </summary>
public virtual void Shutdown() public virtual void Shutdown()
{ {
if (m_console != null) m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting...");
{
m_console.Close();
}
Environment.Exit(0); Environment.Exit(0);
} }

15
OpenSim/Grid/AssetServer/Main.cs
View File

@ -60,8 +60,6 @@ namespace OpenSim.Grid.AssetServer
{ {
XmlConfigurator.Configure(); XmlConfigurator.Configure();
m_log.Info("Starting...\n");
assetserver = new OpenAsset_Main(); assetserver = new OpenAsset_Main();
assetserver.Startup(); assetserver.Startup();
@ -175,18 +173,5 @@ namespace OpenSim.Grid.AssetServer
{ {
m_assetProvider.CreateAsset(asset); 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;
}
}
} }
} }

2
OpenSim/Region/Application/Application.cs
View File

@ -58,8 +58,6 @@ namespace OpenSim
Console.WriteLine(" Environment is unsupported (" + supported + ")\n"); Console.WriteLine(" Environment is unsupported (" + supported + ")\n");
} }
Console.WriteLine("Starting...\n");
Culture.SetCurrentCulture(); Culture.SetCurrentCulture();
ArgvConfigSource configSource = new ArgvConfigSource(args); ArgvConfigSource configSource = new ArgvConfigSource(args);