diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /bin/OpenSim.exe.config | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/OpenSim.exe.config')
-rwxr-xr-x | bin/OpenSim.exe.config | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 8a891f4..1ec3c9c 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
@@ -4,6 +4,7 @@ | |||
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | 4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> |
5 | </configSections> | 5 | </configSections> |
6 | <runtime> | 6 | <runtime> |
7 | <loadFromRemoteSources enabled="true" /> | ||
7 | <gcConcurrent enabled="true" /> | 8 | <gcConcurrent enabled="true" /> |
8 | <gcServer enabled="true" /> | 9 | <gcServer enabled="true" /> |
9 | </runtime> | 10 | </runtime> |
@@ -11,6 +12,10 @@ | |||
11 | </appSettings> | 12 | </appSettings> |
12 | <log4net> | 13 | <log4net> |
13 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | 14 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> |
15 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
16 | <loggerToMatch value="special"/> | ||
17 | <acceptOnMatch value="false"/> | ||
18 | </filter> | ||
14 | <layout type="log4net.Layout.PatternLayout"> | 19 | <layout type="log4net.Layout.PatternLayout"> |
15 | <conversionPattern value="%date{HH:mm:ss} - %message" /> | 20 | <conversionPattern value="%date{HH:mm:ss} - %message" /> |
16 | <!-- console log with milliseconds. Useful for debugging --> | 21 | <!-- console log with milliseconds. Useful for debugging --> |
@@ -21,11 +26,23 @@ | |||
21 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 26 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |
22 | <file value="OpenSim.log" /> | 27 | <file value="OpenSim.log" /> |
23 | <appendToFile value="true" /> | 28 | <appendToFile value="true" /> |
29 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
30 | <loggerToMatch value="special"/> | ||
31 | <acceptOnMatch value="false"/> | ||
32 | </filter> | ||
24 | <layout type="log4net.Layout.PatternLayout"> | 33 | <layout type="log4net.Layout.PatternLayout"> |
25 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | 34 | <conversionPattern value="%date %-5level - %logger %message%newline" /> |
26 | </layout> | 35 | </layout> |
27 | </appender> | 36 | </appender> |
28 | 37 | ||
38 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | ||
39 | <file value="OpenSimStats.log"/> | ||
40 | <appendToFile value="true" /> | ||
41 | <layout type="log4net.Layout.PatternLayout"> | ||
42 | <conversionPattern value="%date - %message%newline" /> | ||
43 | </layout> | ||
44 | </appender> | ||
45 | |||
29 | <root> | 46 | <root> |
30 | <level value="DEBUG" /> | 47 | <level value="DEBUG" /> |
31 | <appender-ref ref="Console" /> | 48 | <appender-ref ref="Console" /> |
@@ -42,5 +59,10 @@ | |||
42 | <level value="INFO"/> | 59 | <level value="INFO"/> |
43 | </logger> | 60 | </logger> |
44 | 61 | ||
62 | <!-- used for stats recording --> | ||
63 | <logger name="special.StatsLogger"> | ||
64 | <appender-ref ref="StatsLogFileAppender"/> | ||
65 | </logger> | ||
66 | |||
45 | </log4net> | 67 | </log4net> |
46 | </configuration> | 68 | </configuration> |