diff options
author | Dan Lake | 2013-02-06 16:42:55 -0800 |
---|---|---|
committer | Dan Lake | 2013-02-06 16:44:59 -0800 |
commit | df37738ce7702774c4d3ff1f3835bfe87e0f1a5e (patch) | |
tree | 67293c7ed7345837caccdbd880770be3f680a475 /OpenSim/Framework | |
parent | BulletSim: remove degenerate triangles from meshes. This fixes the (diff) | |
download | opensim-SC-df37738ce7702774c4d3ff1f3835bfe87e0f1a5e.zip opensim-SC-df37738ce7702774c4d3ff1f3835bfe87e0f1a5e.tar.gz opensim-SC-df37738ce7702774c4d3ff1f3835bfe87e0f1a5e.tar.bz2 opensim-SC-df37738ce7702774c4d3ff1f3835bfe87e0f1a5e.tar.xz |
WebStats will now use actual logfile as specified in OpenSim.exe.config rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Util.cs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 9b1e97d..d9148fb 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -45,6 +45,7 @@ using System.Text.RegularExpressions; | |||
45 | using System.Xml; | 45 | using System.Xml; |
46 | using System.Threading; | 46 | using System.Threading; |
47 | using log4net; | 47 | using log4net; |
48 | using log4net.Appender; | ||
48 | using Nini.Config; | 49 | using Nini.Config; |
49 | using Nwc.XmlRpc; | 50 | using Nwc.XmlRpc; |
50 | using OpenMetaverse; | 51 | using OpenMetaverse; |
@@ -816,9 +817,22 @@ namespace OpenSim.Framework | |||
816 | return "."; | 817 | return "."; |
817 | } | 818 | } |
818 | 819 | ||
820 | public static string logFile() | ||
821 | { | ||
822 | foreach (IAppender appender in LogManager.GetRepository().GetAppenders()) | ||
823 | { | ||
824 | if (appender is FileAppender) | ||
825 | { | ||
826 | return ((FileAppender)appender).File; | ||
827 | } | ||
828 | } | ||
829 | |||
830 | return "./OpenSim.log"; | ||
831 | } | ||
832 | |||
819 | public static string logDir() | 833 | public static string logDir() |
820 | { | 834 | { |
821 | return "."; | 835 | return Path.GetDirectoryName(logFile()); |
822 | } | 836 | } |
823 | 837 | ||
824 | // From: http://coercedcode.blogspot.com/2008/03/c-generate-unique-filenames-within.html | 838 | // From: http://coercedcode.blogspot.com/2008/03/c-generate-unique-filenames-within.html |