Logging: InstallLogger

muratcakir · muratcakir · commit 6dc038100c8d · 2016-09-19T20:11:31.000+02:00
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs
@@ -50,7 +50,7 @@ public void EndLifetimeScope()
 					{
 						if (DataSettings.DatabaseIsInstalled())
 						{
-							scope.Resolve<ILoggerFactory>().CreateLogger(this.GetType()).Flush();
+							scope.Resolve<ILoggerFactory>().GetLogger(this.GetType()).Flush();
 						}		
 					}
 					catch { }
diff --git a/src/Libraries/SmartStore.Core/Logging/ILoggerFactory.cs b/src/Libraries/SmartStore.Core/Logging/ILoggerFactory.cs
@@ -1,21 +1,18 @@
 ﻿using System;
-using System.Diagnostics;
-using SmartStore.Core.Domain.Customers;
-using SmartStore.Core.Domain.Logging;
 
 namespace SmartStore.Core.Logging
 {
 	public interface ILoggerFactory
 	{
-		ILogger CreateLogger(Type type);
-		ILogger CreateLogger(string name);
+		ILogger GetLogger(Type type);
+		ILogger GetLogger(string name);
 	}
 
 	public static class ILoggerFactoryExtensions
 	{
 		public static ILogger CreateLogger<T>(this ILoggerFactory factory) where T : class
 		{
-			return factory.CreateLogger(typeof(T));
+			return factory.GetLogger(typeof(T));
 		}
 	}
 }
diff --git a/src/Libraries/SmartStore.Core/Logging/NullLogger.cs b/src/Libraries/SmartStore.Core/Logging/NullLogger.cs
@@ -36,12 +36,12 @@ public void Flush()
 
 	public class NullLoggerFactory : ILoggerFactory
 	{
-		public ILogger CreateLogger(Type type)
+		public ILogger GetLogger(Type type)
 		{
 			return NullLogger.Instance;
 		}
 
-		public ILogger CreateLogger(string name)
+		public ILogger GetLogger(string name)
 		{
 			return NullLogger.Instance;
 		}
diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs
@@ -31,12 +31,12 @@ private static FileInfo GetConfigFile(string fileName)
 			return result;
 		}
 
-		public ILogger CreateLogger(Type type)
+		public ILogger GetLogger(Type type)
 		{
-			return CreateLogger(type.FullName);
+			return GetLogger(type.FullName);
 		}
 
-		public ILogger CreateLogger(string name)
+		public ILogger GetLogger(string name)
 		{
 			var log = LogManager.GetLogger(name);
 
diff --git a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs
@@ -39,7 +39,7 @@ public ILogger Logger
 				{
 					try
 					{
-						_logger = EngineContext.Current.Resolve<ILoggerFactory>().CreateLogger(this.GetType());
+						_logger = EngineContext.Current.Resolve<ILoggerFactory>().GetLogger(this.GetType());
 					}
 					catch
 					{
diff --git a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs
@@ -454,7 +454,15 @@ protected override void Load(ContainerBuilder builder)
 			builder.RegisterType<Log4netLoggerFactory>().As<ILoggerFactory>().SingleInstance();
 
 			// call CreateLogger in response to the request for an ILogger implementation
-			builder.Register(CreateLogger).As<ILogger>().ExternallyOwned();
+			if (DataSettings.DatabaseIsInstalled())
+			{
+				builder.Register(CreateLogger).As<ILogger>().ExternallyOwned();
+			}
+			else
+			{
+				// the install logger should append to a rolling text file only.
+				builder.Register(CreateInstallLogger).As<ILogger>().ExternallyOwned();
+			}
 		}
 
 		protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration)
@@ -534,13 +542,18 @@ private static ILogger CreateLogger(IComponentContext context, IEnumerable<Param
 			if (parameters != null && parameters.Any())
 			{
 				var containingType = parameters.TypedAs<Type>();
-				return loggerFactory.CreateLogger(containingType);
+				return loggerFactory.GetLogger(containingType);
 			}
 			else
 			{
-				return loggerFactory.CreateLogger("SmartStore");
+				return loggerFactory.GetLogger("SmartStore");
 			}	
 		}
+
+		private static ILogger CreateInstallLogger(IComponentContext context, IEnumerable<Parameter> parameters)
+		{
+			return context.Resolve<ILoggerFactory>().GetLogger("Install");
+		}
 	}
 
 	public class LocalizationModule : Module
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs
@@ -63,7 +63,7 @@ protected virtual void LogUnauthorized(HttpActionContext actionContext, HmacResu
 		{
 			try
 			{
-				var logger = EngineContext.Current.Resolve<ILoggerFactory>().CreateLogger(this.GetType());
+				var logger = EngineContext.Current.Resolve<ILoggerFactory>().GetLogger(this.GetType());
 				var localization = EngineContext.Current.Resolve<ILocalizationService>();
 
 				string strResult = result.ToString();
diff --git a/src/Presentation/SmartStore.Web/Config/log4net.config b/src/Presentation/SmartStore.Web/Config/log4net.config
@@ -11,6 +11,10 @@
     <!--<appender-ref ref="debug-file" />-->
   </root>
 
+  <logger name="Install">
+    <appender-ref ref="debugger"/>
+  </logger>
+
   <logger name="SmartStore">
     <!-- Messages coming from SmartStore are sent to the attached debugger. -->
     <appender-ref ref="debugger"/>

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public void EndLifetimeScope()`
`50`	`50`	`{`
`51`	`51`	`if (DataSettings.DatabaseIsInstalled())`
`52`	`52`	`{`
`53`		`- scope.Resolve<ILoggerFactory>().CreateLogger(this.GetType()).Flush();`
	`53`	`+ scope.Resolve<ILoggerFactory>().GetLogger(this.GetType()).Flush();`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`catch { }`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,18 @@`
`1`	`1`	`using System;`
`2`		`-using System.Diagnostics;`
`3`		`-using SmartStore.Core.Domain.Customers;`
`4`		`-using SmartStore.Core.Domain.Logging;`
`5`	`2`
`6`	`3`	`namespace SmartStore.Core.Logging`
`7`	`4`	`{`
`8`	`5`	`public interface ILoggerFactory`
`9`	`6`	`{`
`10`		`- ILogger CreateLogger(Type type);`
`11`		`- ILogger CreateLogger(string name);`
	`7`	`+ ILogger GetLogger(Type type);`
	`8`	`+ ILogger GetLogger(string name);`
`12`	`9`	`}`
`13`	`10`
`14`	`11`	`public static class ILoggerFactoryExtensions`
`15`	`12`	`{`
`16`	`13`	`public static ILogger CreateLogger<T>(this ILoggerFactory factory) where T : class`
`17`	`14`	`{`
`18`		`- return factory.CreateLogger(typeof(T));`
	`15`	`+ return factory.GetLogger(typeof(T));`
`19`	`16`	`}`
`20`	`17`	`}`
`21`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ public void Flush()`
`36`	`36`
`37`	`37`	`public class NullLoggerFactory : ILoggerFactory`
`38`	`38`	`{`
`39`		`- public ILogger CreateLogger(Type type)`
	`39`	`+ public ILogger GetLogger(Type type)`
`40`	`40`	`{`
`41`	`41`	`return NullLogger.Instance;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public ILogger CreateLogger(string name)`
	`44`	`+ public ILogger GetLogger(string name)`
`45`	`45`	`{`
`46`	`46`	`return NullLogger.Instance;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ private static FileInfo GetConfigFile(string fileName)`
`31`	`31`	`return result;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public ILogger CreateLogger(Type type)`
	`34`	`+ public ILogger GetLogger(Type type)`
`35`	`35`	`{`
`36`		`- return CreateLogger(type.FullName);`
	`36`	`+ return GetLogger(type.FullName);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public ILogger CreateLogger(string name)`
	`39`	`+ public ILogger GetLogger(string name)`
`40`	`40`	`{`
`41`	`41`	`var log = LogManager.GetLogger(name);`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public ILogger Logger`
`39`	`39`	`{`
`40`	`40`	`try`
`41`	`41`	`{`
`42`		`- _logger = EngineContext.Current.Resolve<ILoggerFactory>().CreateLogger(this.GetType());`
	`42`	`+ _logger = EngineContext.Current.Resolve<ILoggerFactory>().GetLogger(this.GetType());`
`43`	`43`	`}`
`44`	`44`	`catch`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,15 @@ protected override void Load(ContainerBuilder builder)`
`454`	`454`	`builder.RegisterType<Log4netLoggerFactory>().As<ILoggerFactory>().SingleInstance();`
`455`	`455`
`456`	`456`	`// call CreateLogger in response to the request for an ILogger implementation`
`457`		`- builder.Register(CreateLogger).As<ILogger>().ExternallyOwned();`
	`457`	`+ if (DataSettings.DatabaseIsInstalled())`
	`458`	`+ {`
	`459`	`+ builder.Register(CreateLogger).As<ILogger>().ExternallyOwned();`
	`460`	`+ }`
	`461`	`+ else`
	`462`	`+ {`
	`463`	`+ // the install logger should append to a rolling text file only.`
	`464`	`+ builder.Register(CreateInstallLogger).As<ILogger>().ExternallyOwned();`
	`465`	`+ }`
`458`	`466`	`}`
`459`	`467`
`460`	`468`	`protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration)`
`@@ -534,13 +542,18 @@ private static ILogger CreateLogger(IComponentContext context, IEnumerable<Param`
`534`	`542`	`if (parameters != null && parameters.Any())`
`535`	`543`	`{`
`536`	`544`	`var containingType = parameters.TypedAs<Type>();`
`537`		`- return loggerFactory.CreateLogger(containingType);`
	`545`	`+ return loggerFactory.GetLogger(containingType);`
`538`	`546`	`}`
`539`	`547`	`else`
`540`	`548`	`{`
`541`		`- return loggerFactory.CreateLogger("SmartStore");`
	`549`	`+ return loggerFactory.GetLogger("SmartStore");`
`542`	`550`	`}`
`543`	`551`	`}`
	`552`	`+`
	`553`	`+ private static ILogger CreateInstallLogger(IComponentContext context, IEnumerable<Parameter> parameters)`
	`554`	`+ {`
	`555`	`+ return context.Resolve<ILoggerFactory>().GetLogger("Install");`
	`556`	`+ }`
`544`	`557`	`}`
`545`	`558`
`546`	`559`	`public class LocalizationModule : Module`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected virtual void LogUnauthorized(HttpActionContext actionContext, HmacResu`
`63`	`63`	`{`
`64`	`64`	`try`
`65`	`65`	`{`
`66`		`- var logger = EngineContext.Current.Resolve<ILoggerFactory>().CreateLogger(this.GetType());`
	`66`	`+ var logger = EngineContext.Current.Resolve<ILoggerFactory>().GetLogger(this.GetType());`
`67`	`67`	`var localization = EngineContext.Current.Resolve<ILocalizationService>();`
`68`	`68`
`69`	`69`	`string strResult = result.ToString();`