aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-01 02:02:20 +0000
committerJustin Clarke Casey2008-06-01 02:02:20 +0000
commitfbaeb081aa6e66cd560c2883c4a514f489c2e3e8 (patch)
tree37af2cd1b3810691c989df4f472909ed6a83e5ae
parent* Fix build break by eliminating remaining IScenePermissions references - mus... (diff)
downloadopensim-SC_OLD-fbaeb081aa6e66cd560c2883c4a514f489c2e3e8.zip
opensim-SC_OLD-fbaeb081aa6e66cd560c2883c4a514f489c2e3e8.tar.gz
opensim-SC_OLD-fbaeb081aa6e66cd560c2883c4a514f489c2e3e8.tar.bz2
opensim-SC_OLD-fbaeb081aa6e66cd560c2883c4a514f489c2e3e8.tar.xz
* Move most bookending startup/shutdown messages to BaseOpenSimServer so they appear in non-console servers too
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs7
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs13
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs15
-rw-r--r--OpenSim/Region/Application/Application.cs2
4 files changed, 6 insertions, 31 deletions
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
48 { 48 {
49 m_componentName = componentname; 49 m_componentName = componentname;
50 m_cmdParser = cmdparser; 50 m_cmdParser = cmdparser;
51
52 m_log.Info("[" + m_componentName + "]: Started at " + DateTime.Now.ToString());
53 }
54
55 public void Close()
56 {
57 m_log.Info("[" + m_componentName + "]: Shutdown at " + DateTime.Now.ToString());
58 } 51 }
59 52
60 /// <summary> 53 /// <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
74 /// Performs initialisation of the scene, such as loading configuration from disk. 74 /// Performs initialisation of the scene, such as loading configuration from disk.
75 /// </summary> 75 /// </summary>
76 public virtual void Startup() 76 public virtual void Startup()
77 { 77 {
78 m_log.Info("[STARTUP]: Beginning startup processing");
79
78 EnhanceVersionInformation(); 80 EnhanceVersionInformation();
79 81
80 m_log.Info("[STARTUP]: Version " + m_version + "\n"); 82 m_log.Info("[STARTUP]: Version " + m_version + "\n");
81 } 83 }
82 84
83 /// <summary> 85 /// <summary>
84 /// Should be overriden by descendents if they need to perform extra shutdown processing 86 /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
85 /// </summary> 87 /// </summary>
86 public virtual void Shutdown() 88 public virtual void Shutdown()
87 { 89 {
88 if (m_console != null) 90 m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting...");
89 {
90 m_console.Close();
91 }
92 91
93 Environment.Exit(0); 92 Environment.Exit(0);
94 } 93 }
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
60 { 60 {
61 XmlConfigurator.Configure(); 61 XmlConfigurator.Configure();
62 62
63 m_log.Info("Starting...\n");
64
65 assetserver = new OpenAsset_Main(); 63 assetserver = new OpenAsset_Main();
66 assetserver.Startup(); 64 assetserver.Startup();
67 65
@@ -175,18 +173,5 @@ namespace OpenSim.Grid.AssetServer
175 { 173 {
176 m_assetProvider.CreateAsset(asset); 174 m_assetProvider.CreateAsset(asset);
177 } 175 }
178
179 public override void RunCmd(string cmd, string[] cmdparams)
180 {
181 base.RunCmd(cmd, cmdparams);
182
183 switch (cmd)
184 {
185 case "shutdown":
186 m_console.Close();
187 Environment.Exit(0);
188 break;
189 }
190 }
191 } 176 }
192} 177}
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
58 Console.WriteLine(" Environment is unsupported (" + supported + ")\n"); 58 Console.WriteLine(" Environment is unsupported (" + supported + ")\n");
59 } 59 }
60 60
61 Console.WriteLine("Starting...\n");
62
63 Culture.SetCurrentCulture(); 61 Culture.SetCurrentCulture();
64 62
65 ArgvConfigSource configSource = new ArgvConfigSource(args); 63 ArgvConfigSource configSource = new ArgvConfigSource(args);