Added Log4Net and supporting classes from v5 in order to start integration of new diagnostic logging system.
This commit is contained in:
@@ -14,3 +14,5 @@ using System.Runtime.CompilerServices;
|
||||
//tg forcing .NET 2.0 security rules, since otherwise it wasn't possible to run in medium trust
|
||||
//(got an inheritance security rules violated by type error)
|
||||
[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)]
|
||||
|
||||
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
|
||||
@@ -113,6 +113,9 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\lib\ICSharpCode.SharpZipLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="log4net">
|
||||
<HintPath>..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\lib\Lucene.Net.dll</HintPath>
|
||||
@@ -264,6 +267,10 @@
|
||||
<None Include="config\ClientDependency.Release.config">
|
||||
<DependentUpon>ClientDependency.config</DependentUpon>
|
||||
</None>
|
||||
<Content Include="config\log4net.config" />
|
||||
<Content Include="config\log4net.Release.config">
|
||||
<DependentUpon>log4net.config</DependentUpon>
|
||||
</Content>
|
||||
<None Include="config\xsltExtensions.Release.config">
|
||||
<DependentUpon>xsltExtensions.config</DependentUpon>
|
||||
</None>
|
||||
@@ -307,6 +314,7 @@
|
||||
<None Include="config\Dashboard.Release.config">
|
||||
<DependentUpon>Dashboard.config</DependentUpon>
|
||||
</None>
|
||||
<Content Include="packages.config" />
|
||||
<None Include="umbraco\config\create\UI.Release.xml">
|
||||
<DependentUpon>UI.xml</DependentUpon>
|
||||
</None>
|
||||
|
||||
25
src/Umbraco.Web.UI/config/log4net.Release.config
Normal file
25
src/Umbraco.Web.UI/config/log4net.Release.config
Normal file
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0"?>
|
||||
<log4net>
|
||||
<root>
|
||||
<priority value="Info"/>
|
||||
<appender-ref ref="AsynchronousLog4NetAppender" />
|
||||
</root>
|
||||
|
||||
|
||||
<!--To Change the way logging works for certain namespaces, insert a new logger like: -->
|
||||
<!--
|
||||
<logger name="Umbraco.Core">
|
||||
<level value="WARN" />
|
||||
</logger>-->
|
||||
|
||||
<appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.AsynchronousRollingFileAppender, Umbraco.Core">
|
||||
<file value="App_Data\Logs\UmbracoTraceLog.txt" />
|
||||
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Date" />
|
||||
<maximumFileSize value="5MB" />
|
||||
<layout type="log4net.Layout.PatternLayout">
|
||||
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
|
||||
</layout>
|
||||
</appender>
|
||||
</log4net>
|
||||
25
src/Umbraco.Web.UI/config/log4net.config
Normal file
25
src/Umbraco.Web.UI/config/log4net.config
Normal file
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0"?>
|
||||
<log4net>
|
||||
<root>
|
||||
<priority value="Info"/>
|
||||
<appender-ref ref="AsynchronousLog4NetAppender" />
|
||||
</root>
|
||||
|
||||
|
||||
<!--To Change the way logging works for certain namespaces, insert a new logger like: -->
|
||||
<!--
|
||||
<logger name="Umbraco.Core">
|
||||
<level value="WARN" />
|
||||
</logger>-->
|
||||
|
||||
<appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.AsynchronousRollingFileAppender, Umbraco.Core">
|
||||
<file value="App_Data\Logs\UmbracoTraceLog.txt" />
|
||||
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
|
||||
<appendToFile value="true" />
|
||||
<rollingStyle value="Date" />
|
||||
<maximumFileSize value="5MB" />
|
||||
<layout type="log4net.Layout.PatternLayout">
|
||||
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
|
||||
</layout>
|
||||
</appender>
|
||||
</log4net>
|
||||
4
src/Umbraco.Web.UI/packages.config
Normal file
4
src/Umbraco.Web.UI/packages.config
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="log4net" version="2.0.0" targetFramework="net40" />
|
||||
</packages>
|
||||
@@ -57,6 +57,8 @@
|
||||
<add key="enableSimpleMembership" value="false"/>
|
||||
<add key="autoFormsAuthentication" value="false"/>
|
||||
<!-- End of added in Umbraco 4.6.2 -->
|
||||
|
||||
<add key="log4net.Config" value="config\log4net.config" />
|
||||
</appSettings>
|
||||
<system.net>
|
||||
<mailSettings>
|
||||
|
||||
Reference in New Issue
Block a user