diff options
author | Jeff Ames | 2008-06-04 09:59:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-04 09:59:27 +0000 |
commit | 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch) | |
tree | cfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Framework/Servers | |
parent | * If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff) | |
download | opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2 opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz |
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 6753a21..0ee21ac 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -40,14 +40,14 @@ namespace OpenSim.Framework.Servers | |||
40 | public abstract class BaseOpenSimServer | 40 | public abstract class BaseOpenSimServer |
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | protected ConsoleBase m_console; | 44 | protected ConsoleBase m_console; |
45 | 45 | ||
46 | /// <summary> | 46 | /// <summary> |
47 | /// Time at which this server was started | 47 | /// Time at which this server was started |
48 | /// </summary> | 48 | /// </summary> |
49 | protected DateTime m_startuptime; | 49 | protected DateTime m_startuptime; |
50 | 50 | ||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Server version information. Usually VersionInfo + information about svn revision, operating system, etc. | 52 | /// Server version information. Usually VersionInfo + information about svn revision, operating system, etc. |
53 | /// </summary> | 53 | /// </summary> |
@@ -66,19 +66,19 @@ namespace OpenSim.Framework.Servers | |||
66 | 66 | ||
67 | public BaseOpenSimServer() | 67 | public BaseOpenSimServer() |
68 | { | 68 | { |
69 | m_startuptime = DateTime.Now; | 69 | m_startuptime = DateTime.Now; |
70 | m_version = VersionInfo.Version; | 70 | m_version = VersionInfo.Version; |
71 | } | 71 | } |
72 | 72 | ||
73 | /// <summary> | 73 | /// <summary> |
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"); | 78 | m_log.Info("[STARTUP]: Beginning startup processing"); |
79 | 79 | ||
80 | EnhanceVersionInformation(); | 80 | EnhanceVersionInformation(); |
81 | 81 | ||
82 | m_log.Info("[STARTUP]: Version " + m_version + "\n"); | 82 | m_log.Info("[STARTUP]: Version " + m_version + "\n"); |
83 | } | 83 | } |
84 | 84 | ||
@@ -86,9 +86,9 @@ namespace OpenSim.Framework.Servers | |||
86 | /// Should be overriden and referenced 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 |
87 | /// </summary> | 87 | /// </summary> |
88 | public virtual void Shutdown() | 88 | public virtual void Shutdown() |
89 | { | 89 | { |
90 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); | 90 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); |
91 | 91 | ||
92 | Environment.Exit(0); | 92 | Environment.Exit(0); |
93 | } | 93 | } |
94 | 94 | ||
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers | |||
110 | Notice("show uptime - show server startup time and uptime."); | 110 | Notice("show uptime - show server startup time and uptime."); |
111 | Notice("show version - show server version."); | 111 | Notice("show version - show server version."); |
112 | Notice("shutdown - shutdown the server.\n"); | 112 | Notice("shutdown - shutdown the server.\n"); |
113 | 113 | ||
114 | break; | 114 | break; |
115 | 115 | ||
116 | case "show": | 116 | case "show": |
@@ -146,10 +146,10 @@ namespace OpenSim.Framework.Servers | |||
146 | Notice("Server has been running since " + m_startuptime.DayOfWeek + ", " + m_startuptime.ToString()); | 146 | Notice("Server has been running since " + m_startuptime.DayOfWeek + ", " + m_startuptime.ToString()); |
147 | Notice("That is an elapsed time of " + (DateTime.Now - m_startuptime).ToString()); | 147 | Notice("That is an elapsed time of " + (DateTime.Now - m_startuptime).ToString()); |
148 | break; | 148 | break; |
149 | 149 | ||
150 | case "version": | 150 | case "version": |
151 | m_console.Notice("This is " + m_version); | 151 | m_console.Notice("This is " + m_version); |
152 | break; | 152 | break; |
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
@@ -172,7 +172,7 @@ namespace OpenSim.Framework.Servers | |||
172 | protected void EnhanceVersionInformation() | 172 | protected void EnhanceVersionInformation() |
173 | { | 173 | { |
174 | string buildVersion = string.Empty; | 174 | string buildVersion = string.Empty; |
175 | 175 | ||
176 | // Add subversion revision information if available | 176 | // Add subversion revision information if available |
177 | // FIXME: Making an assumption about the directory we're currently in - we do this all over the place | 177 | // FIXME: Making an assumption about the directory we're currently in - we do this all over the place |
178 | // elsewhere as well | 178 | // elsewhere as well |
@@ -227,6 +227,6 @@ namespace OpenSim.Framework.Servers | |||
227 | } | 227 | } |
228 | 228 | ||
229 | m_version += ", OS " + OSString; | 229 | m_version += ", OS " + OSString; |
230 | } | 230 | } |
231 | } | 231 | } |
232 | } | 232 | } |