Permalink
Browse files

Merge branch '2.3' into 2.4

  • Loading branch information...
2 parents e40b848 + 868ffff commit fda52a2405778635e30770d47aee541a21ecca79 @sdether sdether committed Apr 12, 2012
Showing with 18 additions and 13 deletions.
  1. +1 −13 src/mindtouch.host/App.config
  2. +14 −0 src/mindtouch.host/log4net.config
  3. +3 −0 src/mindtouch.host/mindtouch.host.csproj
@@ -5,26 +5,14 @@
</configSections>
<appSettings>
<add key="threadpool" value="elastic" />
+ <add key="log4net.Config" value="log4net.config"/>
</appSettings>
<system.net>
<connectionManagement>
<clear />
<add address="*" maxconnection="16" />
</connectionManagement>
</system.net>
- <log4net>
- <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
- <layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
- </layout>
- </appender>
- <renderer renderingClass="MindTouch.Logging.ExceptionRenderer" renderedClass="System.Exception" />
- <!-- Set root logger level to DEBUG and its only appender to A1 -->
- <root>
- <level value="WARN" />
- <appender-ref ref="ConsoleAppender" />
- </root>
- </log4net>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+ <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+ <layout type="log4net.Layout.PatternLayout">
+ <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
+ </layout>
+ </appender>
+ <renderer renderingClass="MindTouch.Logging.ExceptionRenderer" renderedClass="System.Exception" />
+ <!-- Set root logger level to WARN and its only appender to ConsoleAppender -->
+ <root>
+ <level value="WARN" />
+ <appender-ref ref="ConsoleAppender" />
+ </root>
+</log4net>
@@ -62,6 +62,9 @@
<ItemGroup>
<None Include="App.config">
</None>
+ <None Include="log4net.config">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<Content Include="mindtouch.env.xml">

0 comments on commit fda52a2

Please sign in to comment.