Log: fix configuring

ONLYOFFICE · Jul 13, 2021 · ad57fee · ad57fee
1 parent 8d28724
commit ad57fee
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 87 deletions.
diff --git a/common/ASC.Api.Core/Core/BaseStartup.cs b/common/ASC.Api.Core/Core/BaseStartup.cs
@@ -8,7 +8,6 @@
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 using ASC.Common.Mapping;
 
 using Autofac;
@@ -33,8 +32,7 @@ namespace ASC.Api.Core
     public abstract class BaseStartup
     {
         public IConfiguration Configuration { get; }
-        public IHostEnvironment HostEnvironment { get; }
-        public virtual string[] LogParams { get; }
+        public IHostEnvironment HostEnvironment { get; }
         public virtual JsonConverter[] Converters { get; }
         public virtual bool ConfirmAddScheme { get; } = false;
         protected DIHelper DIHelper { get; }
@@ -111,11 +109,6 @@ public virtual void ConfigureServices(IServiceCollection services)
             if (ConfirmAddScheme)
             {
                 authBuilder.AddScheme<AuthenticationSchemeOptions, ConfirmAuthHandler>("confirm", a => { });
-            }
-
-            if (LogParams != null)
-            {
-                LogNLogExtension.ConfigureLog(DIHelper, LogParams);
             }
 
             services.AddAutoMapper(Assembly.GetAssembly(typeof(MappingProfile)));

diff --git a/common/ASC.Common/Logging/Log.cs b/common/ASC.Common/Logging/Log.cs
@@ -98,7 +98,9 @@ public interface ILog
         void FatalFormat(IFormatProvider provider, string format, params object[] args);
 
         string LogDirectory { get; }
-        string Name { get; set; }
+        string Name { get; set; }
+
+        void Configure(string name);
     }
 
     public class Log : ILog
@@ -108,7 +110,7 @@ static Log()
             XmlConfigurator.Configure(log4net.LogManager.GetRepository(Assembly.GetCallingAssembly()));
         }
 
-        private readonly log4net.ILog loger;
+        private log4net.ILog loger;
 
         public bool IsDebugEnabled { get; private set; }
 
@@ -124,15 +126,20 @@ static Log()
 
         public Log(string name)
         {
+            Configure(name);
+        }
+
+        public void Configure(string name)
+        {
             loger = log4net.LogManager.GetLogger(Assembly.GetCallingAssembly(), name);
 
             IsDebugEnabled = loger.IsDebugEnabled;
             IsInfoEnabled = loger.IsInfoEnabled;
             IsWarnEnabled = loger.IsWarnEnabled;
             IsErrorEnabled = loger.IsErrorEnabled;
             IsFatalEnabled = loger.IsFatalEnabled;
-            IsTraceEnabled = loger.Logger.IsEnabledFor(Level.Trace);
-        }
+            IsTraceEnabled = loger.Logger.IsEnabledFor(Level.Trace);
+        }
 
         public void Trace(object message)
         {
@@ -401,14 +408,21 @@ public ConfigureLogNLog(IConfiguration configuration, ConfigurationExtension con
             NLog.Targets.Target.Register<SelfCleaningTarget>("SelfCleaning");
         }
 
-        public void Configure(LogNLog options)
-        {
-
+        public void Configure(LogNLog options)
+{
+            options.Configure("ASC");
         }
 
         public void Configure(string name, LogNLog options)
         {
-            Configure(options);
+            if (string.IsNullOrEmpty(name))
+            {
+                Configure(options);
+            }
+            else
+            {
+                options.Configure(name);
+            }
         }
     }
 
@@ -443,7 +457,12 @@ private NLog.ILogger Loger
 
         public bool IsFatalEnabled { get; private set; }
 
-        public bool IsTraceEnabled { get; private set; }
+        public bool IsTraceEnabled { get; private set; }
+
+        public void Configure(string name)
+        {
+            Name = name;
+        }
 
         public void Trace(object message)
         {
@@ -850,19 +869,23 @@ public void FatalFormat(IFormatProvider provider, string format, params object[]
 
         public void DebugWithProps(string message, KeyValuePair<string, object> prop1, KeyValuePair<string, object> prop2, KeyValuePair<string, object> prop3)
         {
-        }
-
+        }
+
+        public void Configure(string name)
+        {
+        }
+
         public string LogDirectory { get { return ""; } }
 
         public string Name { get; set; }
     }
-
 
     [Singletone]
     public class LogManager<T> : OptionsMonitor<T> where T : class, ILog, new()
     {
         public LogManager(IOptionsFactory<T> factory, IEnumerable<IOptionsChangeTokenSource<T>> sources, IOptionsMonitorCache<T> cache) : base(factory, sources, cache)
-        {
+        {
+
         }
 
         public override T Get(string name)
@@ -881,21 +904,8 @@ public override T Get(string name)
     public class LoggerExtension<T> where T : class, ILog, new()
     {
         public static void RegisterLog(DIHelper services)
-        {
-            const string baseName = "ASC";
-            var baseSqlName = $"{baseName}.SQL";
-            services.Configure<T>(r => r.Name = baseName);
-            services.Configure<T>(baseName, r => r.Name = baseName);
-            services.Configure<T>(baseSqlName, r => r.Name = baseSqlName);
-            services.TryAdd(typeof(IOptionsMonitor<ILog>), typeof(LogManager<T>));
-        }
-
-        public static void ConfigureLog(DIHelper services, params string[] additionalLoggers)
         {
-            foreach (var l in additionalLoggers)
-            {
-                services.Configure<T>(l, r => r.Name = l);
-            }
+            services.TryAdd(typeof(IOptionsMonitor<ILog>), typeof(LogManager<T>));
         }
     }
 

diff --git a/common/services/ASC.ApiSystem/Startup.cs b/common/services/ASC.ApiSystem/Startup.cs
@@ -30,7 +30,6 @@
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 
 using Autofac;
 
@@ -82,8 +81,6 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddAuthentication()
                 .AddScheme<AuthenticationSchemeOptions, AuthHandler>("auth.allowskip", _ => { })
                 .AddScheme<AuthenticationSchemeOptions, AuthHandler>("auth.allowskip.registerportal", _ => { });
-
-            LogNLogExtension.ConfigureLog(diHelper, "ASC.Apisystem");
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

diff --git a/common/services/ASC.ClearEvents/Program.cs b/common/services/ASC.ClearEvents/Program.cs
@@ -31,7 +31,6 @@
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 using ASC.Common.Utils;
 
 using Autofac;
@@ -84,7 +83,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     var diHelper = new DIHelper(services);
 
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                    LogNLogExtension.ConfigureLog(diHelper, "ASC.ClearEvents");
                     services.AddHostedService<ClearEventsServiceLauncher>();
                     diHelper.TryAdd<ClearEventsServiceLauncher>();
                 })

diff --git a/common/services/ASC.Data.Backup/Startup.cs b/common/services/ASC.Data.Backup/Startup.cs
@@ -38,8 +38,6 @@ namespace ASC.Data.Backup
 {
     public class Startup : BaseStartup
     {
-        public override string[] LogParams { get => new string[] { "ASC.Data.Backup" }; }
-
         public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment) : base(configuration, hostEnvironment)
         {
 

diff --git a/common/services/ASC.Data.Storage.Encryption/Startup.cs b/common/services/ASC.Data.Storage.Encryption/Startup.cs
@@ -34,8 +34,6 @@ namespace ASC.Data.Storage.Encryption
 {
     public class Startup : BaseStartup
     {
-        public override string[] LogParams { get => new string[] { "ASC.Data.Storage.Encryption" }; }
-
         public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment) : base(configuration, hostEnvironment)
         {
 

diff --git a/common/services/ASC.Notify/Program.cs b/common/services/ASC.Notify/Program.cs
@@ -6,7 +6,6 @@
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 using ASC.Common.Utils;
 using ASC.Core.Notify.Senders;
 using ASC.Notify.Config;
@@ -67,7 +66,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddMemoryCache();
                     var diHelper = new DIHelper(services);
 
-                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Notify", "ASC.Notify.Messages");
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     diHelper.RegisterProducts(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
 

diff --git a/common/services/ASC.Socket.IO.Svc/Program.cs b/common/services/ASC.Socket.IO.Svc/Program.cs
@@ -32,7 +32,6 @@
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 using ASC.Common.Utils;
 
 using Autofac;
@@ -93,8 +92,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     var diHelper = new DIHelper(services);
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     diHelper.RegisterProducts(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
-
-                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Socket.IO.Svc");
+
                     services.AddHostedService<SocketServiceLauncher>();
                     diHelper.TryAdd<SocketServiceLauncher>();
                 })

diff --git a/common/services/ASC.SsoAuth.Svc/Program.cs b/common/services/ASC.SsoAuth.Svc/Program.cs
@@ -32,7 +32,6 @@
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 using ASC.Common.Utils;
 using ASC.SsoAuth.Svc;
 
@@ -94,8 +93,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     var diHelper = new DIHelper(services);
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     diHelper.RegisterProducts(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
-
-                    LogNLogExtension.ConfigureLog(diHelper, "ASC.SsoAuth.Svc");
+
                     services.AddHostedService<Launcher>();
                     diHelper.TryAdd<Launcher>();
                 })

diff --git a/common/services/ASC.Studio.Notify/Program.cs b/common/services/ASC.Studio.Notify/Program.cs
@@ -6,7 +6,6 @@
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 using ASC.Common.Utils;
 using ASC.Core.Notify;
 using ASC.Notify;
@@ -69,7 +68,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     var diHelper = new DIHelper(services);
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     diHelper.RegisterProducts(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
-                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Notify", "ASC.Notify.Messages");
                     services.AddHostedService<ServiceLauncher>();
                     diHelper.TryAdd<ServiceLauncher>();
                     NotifyConfigurationExtension.Register(diHelper);

diff --git a/common/services/ASC.TelegramService/Startup.cs b/common/services/ASC.TelegramService/Startup.cs
@@ -34,8 +34,6 @@ namespace ASC.TelegramService
 {
     public class Startup : BaseStartup
     {
-        public override string[] LogParams { get => new string[] { "ASC.TelegramService" }; }
-
         public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment) : base(configuration, hostEnvironment)
         {
 

diff --git a/common/services/ASC.Thumbnails.Svc/Program.cs b/common/services/ASC.Thumbnails.Svc/Program.cs
@@ -32,7 +32,6 @@
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 using ASC.Common.Utils;
 
 using Autofac;
@@ -92,8 +91,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddMemoryCache();
                     var diHelper = new DIHelper(services);
 
-                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Thumbnails.Svc");
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     services.AddHostedService<ThumbnailsServiceLauncher>();
                     diHelper.TryAdd<ThumbnailsServiceLauncher>();
                 })

diff --git a/common/services/ASC.UrlShortener.Svc/Program.cs b/common/services/ASC.UrlShortener.Svc/Program.cs
@@ -31,7 +31,6 @@
 using ASC.Api.Core;
 using ASC.Common;
 using ASC.Common.DependencyInjection;
-using ASC.Common.Logging;
 using ASC.Common.Utils;
 
 using Autofac;
@@ -93,8 +92,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                             services.AddMemoryCache();
 
                             var diHelper = new DIHelper(services);
-
-                            LogNLogExtension.ConfigureLog(diHelper, "ASC.UrlShortener.Svc");
+
                             services.AddHostedService<UrlShortenerServiceLauncher>();
                             diHelper.TryAdd<UrlShortenerServiceLauncher>();
                         })

diff --git a/products/ASC.CRM/BackgroundTasks/Program.cs b/products/ASC.CRM/BackgroundTasks/Program.cs
@@ -1,22 +1,20 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-
+
 using ASC.Common;
 using ASC.Common.Caching;
-using ASC.Common.Logging;
+using ASC.Common.DependencyInjection;
 using ASC.Common.Utils;
 using ASC.ElasticSearch;
 using ASC.Web.CRM.Core.Search;
-
+
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
-
+
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using ASC.Common.DependencyInjection;
 
 
 namespace ASC.CRM.BackgroundTasks
@@ -73,9 +71,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
 
                     services.AddHostedService<ServiceLauncher>();
                     diHelper.TryAdd<ServiceLauncher>();
-
-                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Files", "ASC.Feed.Agregator");
-
                     diHelper.TryAdd<FactoryIndexerCase>();
                     diHelper.TryAdd<FactoryIndexerContact>();
                     diHelper.TryAdd<FactoryIndexerContactInfo>();

diff --git a/products/ASC.Calendar/Server/Startup.cs b/products/ASC.Calendar/Server/Startup.cs
@@ -13,8 +13,6 @@ namespace ASC.Calendar
 {
     public class Startup : BaseStartup
     {
-        public override string[] LogParams { get => new string[] { "ASC.Calendar" }; }
-
         public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment)
             : base(configuration, hostEnvironment)
         {

diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
@@ -16,8 +16,7 @@
 namespace ASC.Files
 {
     public class Startup : BaseStartup
-    {
-        public override string[] LogParams { get => new string[] { "ASC.Files" }; }
+    { 
         public override JsonConverter[] Converters { get => new JsonConverter[] { new FileEntryWrapperConverter() }; }
 
         public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment)
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,8 +38,6 @@ namespace ASC.Data.Backup @@
     {
         public class Startup : BaseStartup
         {
-            public override string[] LogParams { get => new string[] { "ASC.Data.Backup" }; }
             public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment) : base(configuration, hostEnvironment)
             {
@@ Expand Down @@