From 95841b5fbcd18444c7b4e24452d002c98a6e432e Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Tue, 7 Dec 2010 15:24:43 -0800
Subject: [PATCH] Updating logger to split into levels depending on namespace,
 to autoflush and also to update log levels on build for azure or CI.

--HG--
branch : dev
---
 AzurePackage.proj                              | 18 +++++++++++-------
 Orchard.proj                                   | 14 +++++++++-----
 src/Orchard.Web/Config/log4net.config          | 15 +++++++++++++--
 .../Records/ContentItemAlteration.cs           |  3 ---
 .../Conventions/RecordTableNameConvention.cs   |  2 --
 .../Providers/AbstractDataServicesProvider.cs  |  2 --
 .../Data/Providers/IDataServicesProvider.cs    |  5 +----
 src/Orchard/Data/SessionLocator.cs             |  2 --
 src/Orchard/WorkContext.cs                     |  4 +---
 9 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/AzurePackage.proj b/AzurePackage.proj
index feda5dc88..202ec1827 100644
--- a/AzurePackage.proj
+++ b/AzurePackage.proj
@@ -99,15 +99,19 @@
     <XmlUpdate XmlFileName="$(CloudRootFolder)\web.config"
       XPath="/configuration/system.web/compilation/@debug"
       Value="false" />
-    
-    <XmlUpdate XmlFileName="$(CloudRootFolder)\Config\Diagnostics.config"
-      XPath="/system.diagnostics/trace/@autoflush"
+
+    <XmlUpdate XmlFileName="$(CloudRootFolder)\Config\log4net.config"
+      XPath="/log4net/appender/immediateFlush/@value"
       Value="false" />
 
-    <XmlUpdate XmlFileName="$(CloudRootFolder)\Config\Diagnostics.config"
-      XPath="/system.diagnostics/sources/source/@switchValue"
-      Value="Error" />
-    
+    <XmlUpdate XmlFileName="$(CloudRootFolder)\Config\log4net.config"
+      XPath="/log4net/logger/priority/@value"
+      Value="ERROR" />
+
+    <XmlUpdate XmlFileName="$(CloudRootFolder)\Config\log4net.config"
+      XPath="/log4net/root/priority/@value"
+      Value="ERROR" />
+
     <Copy 
         SourceFiles="$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService\ServiceConfiguration.cscfg" 
         DestinationFolder="$(StageFolder)" 
diff --git a/Orchard.proj b/Orchard.proj
index 02f327e21..0d10ebf37 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -219,13 +219,17 @@
       XPath="/configuration/system.web/machineKey/@decryptionKey"
       Value="AutoGenerate" />
 
-    <!--<XmlUpdate XmlFileName="$(StageFolder)\Config\Diagnostics.config"
-      XPath="/system.diagnostics/trace/@autoflush"
+    <XmlUpdate XmlFileName="$(StageFolder)\Config\log4net.config"
+      XPath="/log4net/appender/immediateFlush/@value"
       Value="false" />
 
-    <XmlUpdate XmlFileName="$(StageFolder)\Config\Diagnostics.config"
-      XPath="/system.diagnostics/sources/source/@switchValue"
-      Value="Error" />-->
+    <XmlUpdate XmlFileName="$(StageFolder)\Config\log4net.config"
+      XPath="/log4net/logger/priority/@value"
+      Value="ERROR" />
+
+    <XmlUpdate XmlFileName="$(StageFolder)\Config\log4net.config"
+      XPath="/log4net/root/priority/@value"
+      Value="ERROR" />
 
     <!-- move over extra non-content files the csproj referenced -->
     <Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Orchard.Web\%(Identity)')"
diff --git a/src/Orchard.Web/Config/log4net.config b/src/Orchard.Web/Config/log4net.config
index 8c33f623c..86ea12061 100644
--- a/src/Orchard.Web/Config/log4net.config
+++ b/src/Orchard.Web/Config/log4net.config
@@ -2,13 +2,24 @@
 <log4net>
   <root>
     <!-- Value of priority may be ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF -->
-    <priority value="INFO" />
+    <priority value="WARN" />
     <appender-ref ref="RollingLogFileAppender" />
   </root>
 
+  <logger name="Orchard.Localization">
+    <priority value="WARN" />
+    <appender-ref ref="RollingLogFileAppender" />
+  </logger>
+
+  <logger name="Orchard.Data.SessionLocator">
+    <priority value="INFO" />
+    <appender-ref ref="RollingLogFileAppender" />
+  </logger>
+
   <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
     <file value="App_Data/logs/orchard-debug.txt" />
-    <appendToFile value="true"/>
+    <appendToFile value="true" />
+    <immediateFlush value="true" />
 
     <layout type="log4net.Layout.PatternLayout">
       <conversionPattern value="%logger - %message%newline" />
diff --git a/src/Orchard/ContentManagement/Records/ContentItemAlteration.cs b/src/Orchard/ContentManagement/Records/ContentItemAlteration.cs
index 41b197f1f..f816bc72e 100644
--- a/src/Orchard/ContentManagement/Records/ContentItemAlteration.cs
+++ b/src/Orchard/ContentManagement/Records/ContentItemAlteration.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
 using FluentNHibernate.Automapping;
 using FluentNHibernate.Automapping.Alterations;
 using JetBrains.Annotations;
diff --git a/src/Orchard/Data/Conventions/RecordTableNameConvention.cs b/src/Orchard/Data/Conventions/RecordTableNameConvention.cs
index 7613758f4..742f41599 100644
--- a/src/Orchard/Data/Conventions/RecordTableNameConvention.cs
+++ b/src/Orchard/Data/Conventions/RecordTableNameConvention.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using FluentNHibernate.Conventions;
 using FluentNHibernate.Conventions.Instances;
-using Orchard.Environment.Descriptor;
-using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.Data.Conventions {
diff --git a/src/Orchard/Data/Providers/AbstractDataServicesProvider.cs b/src/Orchard/Data/Providers/AbstractDataServicesProvider.cs
index 170308a65..5030e523c 100644
--- a/src/Orchard/Data/Providers/AbstractDataServicesProvider.cs
+++ b/src/Orchard/Data/Providers/AbstractDataServicesProvider.cs
@@ -6,9 +6,7 @@ using FluentNHibernate.Automapping.Alterations;
 using FluentNHibernate.Cfg;
 using FluentNHibernate.Cfg.Db;
 using FluentNHibernate.Conventions.Helpers;
-using NHibernate;
 using NHibernate.Cfg;
-using NHibernate.Tool.hbm2ddl;
 using Orchard.ContentManagement.Records;
 using Orchard.Data.Conventions;
 using Orchard.Environment.ShellBuilders.Models;
diff --git a/src/Orchard/Data/Providers/IDataServicesProvider.cs b/src/Orchard/Data/Providers/IDataServicesProvider.cs
index 7c9c909a3..ccb82267f 100644
--- a/src/Orchard/Data/Providers/IDataServicesProvider.cs
+++ b/src/Orchard/Data/Providers/IDataServicesProvider.cs
@@ -1,7 +1,4 @@
-using System;
-using FluentNHibernate.Cfg;
-using FluentNHibernate.Cfg.Db;
-using NHibernate;
+using FluentNHibernate.Cfg.Db;
 using NHibernate.Cfg;
 
 namespace Orchard.Data.Providers {
diff --git a/src/Orchard/Data/SessionLocator.cs b/src/Orchard/Data/SessionLocator.cs
index 42aebec6a..c1fcd725b 100644
--- a/src/Orchard/Data/SessionLocator.cs
+++ b/src/Orchard/Data/SessionLocator.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Data;
 using NHibernate;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
@@ -22,7 +21,6 @@ namespace Orchard.Data {
 
         public ILogger Logger { get; set; }
 
-
         public ISession For(Type entityType) {
             Logger.Debug("Acquiring session for {0}", entityType);
 
diff --git a/src/Orchard/WorkContext.cs b/src/Orchard/WorkContext.cs
index 49ecfba2c..db4553e4d 100644
--- a/src/Orchard/WorkContext.cs
+++ b/src/Orchard/WorkContext.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Web;
+using System.Web;
 using Orchard.Environment.Extensions.Models;
 using Orchard.Security;
 using Orchard.Settings;
-using Orchard.Themes;
 
 namespace Orchard {
     public abstract class WorkContext {