Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2013-08-07 08:02:36 -0700
committer: Diva Canto 2013-08-07 08:02:36 -0700
commit: 6b9a65972c2ca67b0574f06ec77cab12cf3c1742 (patch)
tree: 05cf2bed80368e880791974b7bdce3dcf02bcbcd /bin
parent: Fixed incomplete commit r/23317 -- see_into_region. Put the guard around esta... (diff)
parent: Add file missing from last commit 4c2f6de (diff)
download: opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.zip
opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.gz
opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.bz2
opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.xz
4 files changed, 99 insertions, 1 deletions
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index 6ac0206..6a6b3c8 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -11,22 +11,56 @@
  </appSettings>
  <log4net>
    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
+        <conversionPattern value="%date{HH:mm:ss} - %message" />
+        <!-- console log with milliseconds.  Useful for debugging -->
+<!--        <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
      </layout>
    </appender>
    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
      <file value="OpenSim.32BitLaunch.log" />
      <appendToFile value="true" />
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
      <layout type="log4net.Layout.PatternLayout">
        <conversionPattern value="%date %-5level - %logger %message%newline" />
      </layout>
    </appender>
+    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="OpenSimStats.log"/>
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date - %message%newline" />
+      </layout>
+    </appender>
    <root>
      <level value="DEBUG" />
      <appender-ref ref="Console" />
      <appender-ref ref="LogFileAppender" />
    </root>
+    <!-- Independently control logging level for XEngine -->
+    <logger name="OpenSim.Region.ScriptEngine.XEngine">
+      <level value="INFO"/>
+    </logger>
+    <!-- Independently control logging level for per region module loading -->
+    <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
+      <level value="INFO"/>
+    </logger>
+    <!-- used for stats recording -->
+    <logger name="special.StatsLogger">
+      <appender-ref ref="StatsLogFileAppender"/>
+    </logger>
  </log4net>
 </configuration>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 8a891f4..b2cb4e5 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -11,6 +11,10 @@
  </appSettings>
  <log4net>
    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
      <layout type="log4net.Layout.PatternLayout">
        <conversionPattern value="%date{HH:mm:ss} - %message" />
        <!-- console log with milliseconds.  Useful for debugging -->
@@ -21,11 +25,23 @@
    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
      <file value="OpenSim.log" />
      <appendToFile value="true" />
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
      <layout type="log4net.Layout.PatternLayout">
        <conversionPattern value="%date %-5level - %logger %message%newline" />
      </layout>
    </appender>
+    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="OpenSimStats.log"/>
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date - %message%newline" />
+      </layout>
+    </appender>
    <root>
      <level value="DEBUG" />
      <appender-ref ref="Console" />
@@ -42,5 +58,10 @@
      <level value="INFO"/>
    </logger>
+    <!-- used for stats recording -->
+    <logger name="special.StatsLogger">
+      <appender-ref ref="StatsLogFileAppender"/>
+    </logger>
  </log4net>
 </configuration>
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
index dae45ff..ec17049 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -11,22 +11,44 @@
  </appSettings>
  <log4net>
    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
      <layout type="log4net.Layout.PatternLayout">
        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
      </layout>
    </appender>
    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
      <file value="Robust.32BitLaunch.log" />
      <appendToFile value="true" />
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
      <layout type="log4net.Layout.PatternLayout">
        <conversionPattern value="%date %-5level - %logger %message%newline" />
      </layout>
    </appender>
+    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="RobustStats.log"/>
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date - %message%newline" />
+      </layout>
+    </appender>
    <root>
      <level value="DEBUG" />
      <appender-ref ref="Console" />
      <appender-ref ref="LogFileAppender" />
    </root>
+    <!-- used for stats recording -->
+    <logger name="special.StatsLogger">
+      <appender-ref ref="StatsLogFileAppender"/>
+    </logger>
  </log4net>
 </configuration>
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 4914f55..62975fd 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -11,6 +11,10 @@
  </appSettings>
  <log4net>
    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
      <layout type="log4net.Layout.PatternLayout">
        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
      </layout>
@@ -19,15 +23,32 @@
    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
      <file value="Robust.log" />
      <appendToFile value="true" />
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
      <layout type="log4net.Layout.PatternLayout">
        <conversionPattern value="%date %-5level - %logger %message%newline" />
      </layout>
    </appender>
+    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="RobustStats.log"/>
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date - %message%newline" />
+      </layout>
+    </appender>
    <root>
      <level value="DEBUG" />
      <appender-ref ref="Console" />
      <appender-ref ref="LogFileAppender" />
    </root>
+    <!-- used for stats recording -->
+    <logger name="special.StatsLogger">
+      <appender-ref ref="StatsLogFileAppender"/>
+    </logger>
  </log4net>
 </configuration>
author	Diva Canto	2013-08-07 08:02:36 -0700
committer	Diva Canto	2013-08-07 08:02:36 -0700
commit	6b9a65972c2ca67b0574f06ec77cab12cf3c1742 (patch)
tree	05cf2bed80368e880791974b7bdce3dcf02bcbcd /bin
parent	Fixed incomplete commit r/23317 -- see_into_region. Put the guard around esta... (diff)
parent	Add file missing from last commit 4c2f6de (diff)
download	opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.zip opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.gz opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.bz2 opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.xz

diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config index 6ac0206..6a6b3c8 100644 --- a/bin/OpenSim.32BitLaunch.exe.config +++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -11,22 +11,56 @@
11	</appSettings>	11	</appSettings>
12	<log4net>	12	<log4net>
13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">	13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
		14	<filter type="log4net.Filter.LoggerMatchFilter">
		15	<loggerToMatch value="special"/>
		16	<acceptOnMatch value="false"/>
		17	</filter>
14	<layout type="log4net.Layout.PatternLayout">	18	<layout type="log4net.Layout.PatternLayout">
15	<conversionPattern value="%date{HH:mm:ss} - %message%newline" />	19	<conversionPattern value="%date{HH:mm:ss} - %message" />
		20	<!-- console log with milliseconds. Useful for debugging -->
		21	<!-- <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
16	</layout>	22	</layout>
17	</appender>	23	</appender>
		24
18	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">	25	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
19	<file value="OpenSim.32BitLaunch.log" />	26	<file value="OpenSim.32BitLaunch.log" />
20	<appendToFile value="true" />	27	<appendToFile value="true" />
		28	<filter type="log4net.Filter.LoggerMatchFilter">
		29	<loggerToMatch value="special"/>
		30	<acceptOnMatch value="false"/>
		31	</filter>
21	<layout type="log4net.Layout.PatternLayout">	32	<layout type="log4net.Layout.PatternLayout">
22	<conversionPattern value="%date %-5level - %logger %message%newline" />	33	<conversionPattern value="%date %-5level - %logger %message%newline" />
23	</layout>	34	</layout>
24	</appender>	35	</appender>
25		36
		37	<appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
		38	<file value="OpenSimStats.log"/>
		39	<appendToFile value="true" />
		40	<layout type="log4net.Layout.PatternLayout">
		41	<conversionPattern value="%date - %message%newline" />
		42	</layout>
		43	</appender>
		44
26	<root>	45	<root>
27	<level value="DEBUG" />	46	<level value="DEBUG" />
28	<appender-ref ref="Console" />	47	<appender-ref ref="Console" />
29	<appender-ref ref="LogFileAppender" />	48	<appender-ref ref="LogFileAppender" />
30	</root>	49	</root>
		50
		51	<!-- Independently control logging level for XEngine -->
		52	<logger name="OpenSim.Region.ScriptEngine.XEngine">
		53	<level value="INFO"/>
		54	</logger>
		55
		56	<!-- Independently control logging level for per region module loading -->
		57	<logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
		58	<level value="INFO"/>
		59	</logger>
		60
		61	<!-- used for stats recording -->
		62	<logger name="special.StatsLogger">
		63	<appender-ref ref="StatsLogFileAppender"/>
		64	</logger>
31	</log4net>	65	</log4net>
32	</configuration>	66	</configuration>


diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 8a891f4..b2cb4e5 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config
@@ -11,6 +11,10 @@
11	</appSettings>	11	</appSettings>
12	<log4net>	12	<log4net>
13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">	13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
		14	<filter type="log4net.Filter.LoggerMatchFilter">
		15	<loggerToMatch value="special"/>
		16	<acceptOnMatch value="false"/>
		17	</filter>
14	<layout type="log4net.Layout.PatternLayout">	18	<layout type="log4net.Layout.PatternLayout">
15	<conversionPattern value="%date{HH:mm:ss} - %message" />	19	<conversionPattern value="%date{HH:mm:ss} - %message" />
16	<!-- console log with milliseconds. Useful for debugging -->	20	<!-- console log with milliseconds. Useful for debugging -->
@@ -21,11 +25,23 @@
21	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">	25	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
22	<file value="OpenSim.log" />	26	<file value="OpenSim.log" />
23	<appendToFile value="true" />	27	<appendToFile value="true" />
		28	<filter type="log4net.Filter.LoggerMatchFilter">
		29	<loggerToMatch value="special"/>
		30	<acceptOnMatch value="false"/>
		31	</filter>
24	<layout type="log4net.Layout.PatternLayout">	32	<layout type="log4net.Layout.PatternLayout">
25	<conversionPattern value="%date %-5level - %logger %message%newline" />	33	<conversionPattern value="%date %-5level - %logger %message%newline" />
26	</layout>	34	</layout>
27	</appender>	35	</appender>
28		36
		37	<appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
		38	<file value="OpenSimStats.log"/>
		39	<appendToFile value="true" />
		40	<layout type="log4net.Layout.PatternLayout">
		41	<conversionPattern value="%date - %message%newline" />
		42	</layout>
		43	</appender>
		44
29	<root>	45	<root>
30	<level value="DEBUG" />	46	<level value="DEBUG" />
31	<appender-ref ref="Console" />	47	<appender-ref ref="Console" />
@@ -42,5 +58,10 @@
42	<level value="INFO"/>	58	<level value="INFO"/>
43	</logger>	59	</logger>
44		60
		61	<!-- used for stats recording -->
		62	<logger name="special.StatsLogger">
		63	<appender-ref ref="StatsLogFileAppender"/>
		64	</logger>
		65
45	</log4net>	66	</log4net>
46	</configuration>	67	</configuration>


diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config index dae45ff..ec17049 100644 --- a/bin/Robust.32BitLaunch.exe.config +++ b/bin/Robust.32BitLaunch.exe.config
@@ -11,22 +11,44 @@
11	</appSettings>	11	</appSettings>
12	<log4net>	12	<log4net>
13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">	13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
		14	<filter type="log4net.Filter.LoggerMatchFilter">
		15	<loggerToMatch value="special"/>
		16	<acceptOnMatch value="false"/>
		17	</filter>
14	<layout type="log4net.Layout.PatternLayout">	18	<layout type="log4net.Layout.PatternLayout">
15	<conversionPattern value="%date{HH:mm:ss} - %message%newline" />	19	<conversionPattern value="%date{HH:mm:ss} - %message%newline" />
16	</layout>	20	</layout>
17	</appender>	21	</appender>
		22
18	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">	23	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
19	<file value="Robust.32BitLaunch.log" />	24	<file value="Robust.32BitLaunch.log" />
20	<appendToFile value="true" />	25	<appendToFile value="true" />
		26	<filter type="log4net.Filter.LoggerMatchFilter">
		27	<loggerToMatch value="special"/>
		28	<acceptOnMatch value="false"/>
		29	</filter>
21	<layout type="log4net.Layout.PatternLayout">	30	<layout type="log4net.Layout.PatternLayout">
22	<conversionPattern value="%date %-5level - %logger %message%newline" />	31	<conversionPattern value="%date %-5level - %logger %message%newline" />
23	</layout>	32	</layout>
24	</appender>	33	</appender>
25		34
		35	<appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
		36	<file value="RobustStats.log"/>
		37	<appendToFile value="true" />
		38	<layout type="log4net.Layout.PatternLayout">
		39	<conversionPattern value="%date - %message%newline" />
		40	</layout>
		41	</appender>
		42
26	<root>	43	<root>
27	<level value="DEBUG" />	44	<level value="DEBUG" />
28	<appender-ref ref="Console" />	45	<appender-ref ref="Console" />
29	<appender-ref ref="LogFileAppender" />	46	<appender-ref ref="LogFileAppender" />
30	</root>	47	</root>
		48
		49	<!-- used for stats recording -->
		50	<logger name="special.StatsLogger">
		51	<appender-ref ref="StatsLogFileAppender"/>
		52	</logger>
31	</log4net>	53	</log4net>
32	</configuration>	54	</configuration>


diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config index 4914f55..62975fd 100644 --- a/bin/Robust.exe.config +++ b/bin/Robust.exe.config
@@ -11,6 +11,10 @@
11	</appSettings>	11	</appSettings>
12	<log4net>	12	<log4net>
13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">	13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
		14	<filter type="log4net.Filter.LoggerMatchFilter">
		15	<loggerToMatch value="special"/>
		16	<acceptOnMatch value="false"/>
		17	</filter>
14	<layout type="log4net.Layout.PatternLayout">	18	<layout type="log4net.Layout.PatternLayout">
15	<conversionPattern value="%date{HH:mm:ss} - %message%newline" />	19	<conversionPattern value="%date{HH:mm:ss} - %message%newline" />
16	</layout>	20	</layout>
@@ -19,15 +23,32 @@
19	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">	23	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
20	<file value="Robust.log" />	24	<file value="Robust.log" />
21	<appendToFile value="true" />	25	<appendToFile value="true" />
		26	<filter type="log4net.Filter.LoggerMatchFilter">
		27	<loggerToMatch value="special"/>
		28	<acceptOnMatch value="false"/>
		29	</filter>
22	<layout type="log4net.Layout.PatternLayout">	30	<layout type="log4net.Layout.PatternLayout">
23	<conversionPattern value="%date %-5level - %logger %message%newline" />	31	<conversionPattern value="%date %-5level - %logger %message%newline" />
24	</layout>	32	</layout>
25	</appender>	33	</appender>
26		34
		35	<appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
		36	<file value="RobustStats.log"/>
		37	<appendToFile value="true" />
		38	<layout type="log4net.Layout.PatternLayout">
		39	<conversionPattern value="%date - %message%newline" />
		40	</layout>
		41	</appender>
		42
27	<root>	43	<root>
28	<level value="DEBUG" />	44	<level value="DEBUG" />
29	<appender-ref ref="Console" />	45	<appender-ref ref="Console" />
30	<appender-ref ref="LogFileAppender" />	46	<appender-ref ref="LogFileAppender" />
31	</root>	47	</root>
		48
		49	<!-- used for stats recording -->
		50	<logger name="special.StatsLogger">
		51	<appender-ref ref="StatsLogFileAppender"/>
		52	</logger>
32	</log4net>	53	</log4net>
33	</configuration>	54	</configuration>