diff options
author | Justin Clarke Casey | 2008-10-04 20:27:55 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-04 20:27:55 +0000 |
commit | 31362a67dfb5b1fe22100be17204e80252f261d9 (patch) | |
tree | 48c6ea822162202525aef8a11b42d2ece5378cef /OpenSim/Region/Application/Application.cs | |
parent | * minor: both OpenSimBase and the Voice and RemoteAdmin modules were checking... (diff) | |
download | opensim-SC-31362a67dfb5b1fe22100be17204e80252f261d9.zip opensim-SC-31362a67dfb5b1fe22100be17204e80252f261d9.tar.gz opensim-SC-31362a67dfb5b1fe22100be17204e80252f261d9.tar.bz2 opensim-SC-31362a67dfb5b1fe22100be17204e80252f261d9.tar.xz |
* Tidy up configuration stuff, eliminated default setting duplication along the way
* This revision also makes the exception catcher of last resort print to the log instead of just the console
* This means logs should now capture sim crashing exceptions, though not those which are caused by a crash of the virtual machine itself
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 8d2ce55..86661b8 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Net; | 29 | using System.Net; |
30 | using System.Reflection; | ||
31 | using log4net; | ||
30 | using log4net.Config; | 32 | using log4net.Config; |
31 | using Nini.Config; | 33 | using Nini.Config; |
32 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
@@ -36,6 +38,8 @@ namespace OpenSim | |||
36 | { | 38 | { |
37 | public class Application | 39 | public class Application |
38 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | |||
39 | public static string iniFilePath = ""; | 43 | public static string iniFilePath = ""; |
40 | 44 | ||
41 | //could move our main function into OpenSimMain and kill this class | 45 | //could move our main function into OpenSimMain and kill this class |
@@ -124,9 +128,7 @@ namespace OpenSim | |||
124 | msg += "\r\n"; | 128 | msg += "\r\n"; |
125 | msg += "Application is terminating: " + e.IsTerminating.ToString() + "\r\n"; | 129 | msg += "Application is terminating: " + e.IsTerminating.ToString() + "\r\n"; |
126 | 130 | ||
127 | // Do we not always want to see exception messages? | 131 | m_log.ErrorFormat("[APPLICATION]: {0}", msg); |
128 | // if (e.IsTerminating) | ||
129 | MainConsole.Instance.Error("[APPLICATION]: " + msg); | ||
130 | 132 | ||
131 | // Try to post errormessage to an URL | 133 | // Try to post errormessage to an URL |
132 | try | 134 | try |