diff options
author | Justin Clark-Casey (justincc) | 2012-11-22 04:45:53 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-22 04:45:53 +0000 |
commit | 45d1e6ab09309e21f96979548b5d1b4904800f65 (patch) | |
tree | 7100fb7c02636a06e9c7de8d0c644de5f118c5e1 /OpenSim/Region/Application/OpenSim.cs | |
parent | Factor out common registration of "show uptime" command (diff) | |
download | opensim-SC_OLD-45d1e6ab09309e21f96979548b5d1b4904800f65.zip opensim-SC_OLD-45d1e6ab09309e21f96979548b5d1b4904800f65.tar.gz opensim-SC_OLD-45d1e6ab09309e21f96979548b5d1b4904800f65.tar.bz2 opensim-SC_OLD-45d1e6ab09309e21f96979548b5d1b4904800f65.tar.xz |
Make "show info" command available across all servers
This helpfully lists version information, startup location and console log level
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 47252f6..e5aecbc 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -106,22 +106,6 @@ namespace OpenSim | |||
106 | m_timeInterval = startupConfig.GetInt("timer_Interval", 1200); | 106 | m_timeInterval = startupConfig.GetInt("timer_Interval", 1200); |
107 | } | 107 | } |
108 | 108 | ||
109 | if (m_logFileAppender != null) | ||
110 | { | ||
111 | if (m_logFileAppender is log4net.Appender.FileAppender) | ||
112 | { | ||
113 | log4net.Appender.FileAppender appender = | ||
114 | (log4net.Appender.FileAppender)m_logFileAppender; | ||
115 | string fileName = startupConfig.GetString("LogFile", String.Empty); | ||
116 | if (fileName != String.Empty) | ||
117 | { | ||
118 | appender.File = fileName; | ||
119 | appender.ActivateOptions(); | ||
120 | } | ||
121 | m_log.InfoFormat("[LOGGING]: Logging started to file {0}", appender.File); | ||
122 | } | ||
123 | } | ||
124 | |||
125 | string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty); | 109 | string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty); |
126 | FireAndForgetMethod asyncCallMethod; | 110 | FireAndForgetMethod asyncCallMethod; |
127 | if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod)) | 111 | if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod)) |
@@ -174,6 +158,7 @@ namespace OpenSim | |||
174 | 158 | ||
175 | MainConsole.Instance = m_console; | 159 | MainConsole.Instance = m_console; |
176 | 160 | ||
161 | RegisterCommonAppenders(m_config.Source.Configs["Startup"]); | ||
177 | RegisterConsoleCommands(); | 162 | RegisterConsoleCommands(); |
178 | 163 | ||
179 | base.StartupSpecific(); | 164 | base.StartupSpecific(); |