After-merge logging related changes

- files summaries update
- other minor changes

Author: alex-kulakov

Extensions/Xtensive.Orm.Logging.NLog/Log.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Xtensive LLC.
+// Copyright (C) 2013-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov
@@ -17,22 +17,6 @@ public class Log : BaseLog
   {
     private readonly Logger target;
 
-    private static NLogLevel ConvertLevel(LogLevel level)
-    {
-      switch (level) {
-      case LogLevel.Debug:
-        return NLogLevel.Debug;
-      case LogLevel.Error:
-        return NLogLevel.Error;
-      case LogLevel.FatalError:
-        return NLogLevel.Fatal;
-      case LogLevel.Warning:
-        return NLogLevel.Warn;
-      default:
-        return NLogLevel.Info;
-      }
-    }
-
     /// <inheritdoc/>
     public override bool IsLogged(LogLevel level)
     {
@@ -48,6 +32,22 @@ public override void Write(in LogEventInfo info)
         target.Log(ConvertLevel(info.Level), info.FormattedMessage);
     }
 
+    private static NLogLevel ConvertLevel(in LogLevel level)
+    {
+      switch (level) {
+        case LogLevel.Debug:
+          return NLogLevel.Debug;
+        case LogLevel.Error:
+          return NLogLevel.Error;
+        case LogLevel.FatalError:
+          return NLogLevel.Fatal;
+        case LogLevel.Warning:
+          return NLogLevel.Warn;
+        default:
+          return NLogLevel.Info;
+      }
+    }
+
     /// <summary>
     /// Creates instance of <see cref="Log"/> class.
     /// </summary>

Extensions/Xtensive.Orm.Logging.log4net/Log.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
@@ -16,25 +16,7 @@ namespace Xtensive.Orm.Logging.log4net
   /// </summary>
   public class Log : BaseLog
   {
-    private log4netLog target;
-
-    private Level ConvertLevel(LogLevel level)
-    {
-      switch (level) {
-      case LogLevel.Debug:
-        return Level.Debug;
-      case LogLevel.Info:
-        return Level.Info;
-      case LogLevel.Warning:
-        return Level.Warn;
-      case LogLevel.Error:
-        return Level.Error;
-      case LogLevel.FatalError:
-        return Level.Fatal;
-      default:
-        return Level.Info;
-      }
-    }
+    private readonly log4netLog target;
 
     /// <inheritdoc />
     public override bool IsLogged(LogLevel level)
@@ -48,6 +30,24 @@ public override void Write(in LogEventInfo info)
       target.Logger.Log(target.Logger.GetType(), ConvertLevel(info.Level), info.FormattedMessage, info.Exception);
     }
 
+    private Level ConvertLevel(in LogLevel level)
+    {
+      switch (level) {
+        case LogLevel.Debug:
+          return Level.Debug;
+        case LogLevel.Info:
+          return Level.Info;
+        case LogLevel.Warning:
+          return Level.Warn;
+        case LogLevel.Error:
+          return Level.Error;
+        case LogLevel.FatalError:
+          return Level.Fatal;
+        default:
+          return Level.Info;
+      }
+    }
+
     /// <summary>
     /// Creates instance of <see cref="Log"/> class.
     /// </summary>
@@ -57,6 +57,7 @@ public override void Write(in LogEventInfo info)
     public Log(Assembly repositoryAssembly, string name)
     {
       target = log4netLogManager.GetLogger(repositoryAssembly, name);
+
     }
   }
 }

Orm/Xtensive.Orm.Tests.Core/DotNetFramework/NewTupleLogicTest.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alex Yakunin
 // Created:    2009.09.02
 

Orm/Xtensive.Orm.Tests.Core/DotNetFramework/ThreadingTest.cs

@@ -1,6 +1,6 @@
 // Copyright (C) 2008-2021 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alex Yakunin
 // Created:    2008.05.27
 

Orm/Xtensive.Orm/InternalLogs.tt

@@ -20,23 +20,23 @@ namespace Xtensive
       return instance.IsLogged(type);
     }
 
-    public static IDisposable DebugRegion(string format, params object[] args)
+    public static IndentManager.IndentScope DebugRegion(string messageId, params object[] args)
     {
       return instance.DebugRegion(format, args);
     }
 
-    public static IDisposable InfoRegion(string format, params object[] args)
+    public static IndentManager.IndentScope InfoRegion(string messageId, params object[] args)
     {
       return instance.InfoRegion(format, args);
     }
 
 <# foreach (var level in logLevels) { #>
-    public static void <#= level #>(string format, params object[] args)
+    public static void <#= level #>(string messageId, params object[] args)
     {
       instance.<#= level #>(format, args);
     }
 
-    public static Exception <#= level #>(Exception exception, string format, params object[] args)
+    public static Exception <#= level #>(Exception exception, string messageId, params object[] args)
     {
       instance.<#= level #>(format, args, exception);
       return exception;

Orm/Xtensive.Orm/Modelling/Comparison/Upgrader.cs

@@ -160,17 +160,18 @@ public IReadOnlyList<NodeAction> GetUpgradeSequence(Difference difference, HintS
             .ForEach(validationHints.Add);
           var diff = comparer.Compare(CurrentModel, TargetModel, validationHints);
           if (diff != null) {
-            CoreLog.InfoRegion(nameof(Strings.LogAutomaticUpgradeSequenceValidation));
-            CoreLog.Info(nameof(Strings.LogValidationFailed));
-            CoreLog.Info(nameof(Strings.LogItemFormat), Strings.Difference);
-            CoreLog.Info("{0}", diff);
-            CoreLog.Info(Strings.LogItemFormat + "\r\n{1}", Strings.UpgradeSequence,
-              new ActionSequence() { actions });
-            CoreLog.Info(nameof(Strings.LogItemFormat), Strings.ExpectedTargetModel);
-            TargetModel.Dump();
-            CoreLog.Info(nameof(Strings.LogItemFormat), Strings.ActualTargetModel);
-            CurrentModel.Dump();
-            throw new InvalidOperationException(Strings.ExUpgradeSequenceValidationFailure);
+            using (CoreLog.InfoRegion(nameof(Strings.LogAutomaticUpgradeSequenceValidation))) {
+              CoreLog.Info(nameof(Strings.LogValidationFailed));
+              CoreLog.Info(nameof(Strings.LogItemFormat), Strings.Difference);
+              CoreLog.Info(diff.ToString());
+              CoreLog.Info(Strings.LogItemFormat + "\r\n{1}", Strings.UpgradeSequence,
+                new ActionSequence() { actions });
+              CoreLog.Info(nameof(Strings.LogItemFormat), Strings.ExpectedTargetModel);
+              TargetModel.Dump();
+              CoreLog.Info(nameof(Strings.LogItemFormat), Strings.ActualTargetModel);
+              CurrentModel.Dump();
+              throw new InvalidOperationException(Strings.ExUpgradeSequenceValidationFailure);
+            }
           }
 
           return new ReadOnlyCollection<NodeAction>(actions.Actions.ToArray());

Orm/Xtensive.Orm/Orm/Logging/BaseLog.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2013 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2013-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
 // Created:    2013.10.11
 
@@ -29,7 +29,10 @@ public abstract class BaseLog
     /// <summary>
     /// Creates region. Within the region, all messages are indented.
     /// </summary>
-    /// <param name="messageId">Identifier of the message in resources that should be written at the begging and at the end of the region or message itself.</param>
+    /// <param name="messageId">
+    /// Identifier of the message in resources that should be written at the begging
+    /// and at the end of the region or message itself.
+    /// </param>
     /// <param name="parameters">Values of parameters in <paramref name="messageId"/> (resource string or message itself).</param>
     /// <returns><see cref="IDisposable"/> object. Region will closed by disposing of this object.</returns>
     public IndentManager.IndentScope DebugRegion(string messageId, params object[] parameters)
@@ -47,8 +50,13 @@ public IndentManager.IndentScope DebugRegion(string messageId, params object[] p
     /// <summary>
     /// Creates region. Within the region, all messages are indented.
     /// </summary>
-    /// <param name="messageId">Identifier of the message in resources that should be written at the begging and at the end of the region or message itself.</param>
-    /// <param name="parameters">Values of parameters in <paramref name="messageId"/> (resource string or message itself).</param>
+    /// <param name="messageId">
+    /// Identifier of the message in resources that should be written at the begging
+    /// and at the end of the region or message itself.
+    /// </param>
+    /// <param name="parameters">
+    /// Values of parameters in <paramref name="messageId"/> (resource string or message itself).
+    /// </param>
     /// <returns><see cref="IDisposable"/> object. Region will closed by disposing of this object.</returns>
     public IndentManager.IndentScope InfoRegion(string messageId, params object[] parameters)
     {
@@ -64,44 +72,63 @@ public IndentManager.IndentScope InfoRegion(string messageId, params object[] pa
     /// <summary>
     /// Writes debug message.
     /// </summary>
-    /// <param name="messageId">Identifier of the message in resources that should be written at the begging and at the end of the region or message itself.</param>
-    /// <param name="parameters">Values of parameters in <paramref name="messageId"/> (resource string or message itself).</param>
+    /// <param name="messageId">
+    /// Identifier of message in resources that should be written to log or message itself.
+    /// </param>
+    /// <param name="parameters">
+    /// Values of parameters in <paramref name="messageId"/> (resource string or message itself).
+    /// </param>
     /// <param name="exception">Exception, which must be written.</param>
     public virtual void Debug(string messageId, object[] parameters = null, Exception exception = null) =>
       Write(LogLevel.Debug, messageId, parameters, exception);
 
     /// <summary>
     /// Writes information message.
     /// </summary>
-    /// <param name="messageId">Identifier of message in resources that should be written to log or message itself.</param>
-    /// <param name="parameters">Values of parameters in <paramref name="messageId"/> (resource string or message itself).</param>
+    /// <param name="messageId">
+    /// Identifier of message in resources that should be written to log or message itself.</param>
+    /// <param name="parameters">
+    /// Values of parameters in <paramref name="messageId"/> (resource string or message itself).
+    /// </param>
     /// <param name="exception">Exception, which must be written.</param>
     public virtual void Info(string messageId, object[] parameters = null, Exception exception = null) =>
       Write(LogLevel.Info, messageId, parameters, exception);
 
     /// <summary>
     /// Writes warning message.
     /// </summary>
-    /// <param name="messageId">Identifier of message in resources that should be written to log or message itself.</param>
-    /// <param name="parameters">Values of parameters in <paramref name="messageId"/> (resource string or message itself).</param>
+    /// <param name="messageId">
+    /// Identifier of message in resources that should be written to log or message itself.
+    /// </param>
+    /// <param name="parameters">
+    /// Values of parameters in <paramref name="messageId"/> (resource string or message itself).
+    /// </param>
     /// <param name="exception">Exception, which must be written.</param>
     public virtual void Warning(string messageId, object[] parameters = null, Exception exception = null) =>
       Write(LogLevel.Warning, messageId, parameters, exception);
 
     /// <summary>
     /// Writes error message.
     /// </summary>
-    /// <param name="messageId">Identifier of message in resources that should be written to log or message itself.</param>
-    /// <param name="parameters">Values of parameters in <paramref name="messageId"/> (resource string or message itself).</param>
+    /// <param name="messageId">
+    /// Identifier of message in resources that should be written to log or message itself.
+    /// </param>
+    /// <param name="parameters">
+    /// Values of parameters in <paramref name="messageId"/> (resource string or message itself).
+    /// </param>
     /// <param name="exception">Exception, which must be written.</param>
     public virtual void Error(string messageId, object[] parameters = null, Exception exception = null) =>
       Write(LogLevel.Error, messageId, parameters, exception);
 
     /// <summary>
     /// Writes fatal error message.
     /// </summary>
-    /// <param name="messageId">Identifier of message in resources that should be written to log or message itself.</param>
-    /// <param name="parameters">Values of parameters in <paramref name="messageId"/>.</param>
+    /// <param name="messageId">
+    /// Identifier of message in resources that should be written to log or message itself.
+    /// </param>
+    /// <param name="parameters">
+    /// Values of parameters in <paramref name="messageId"/> (resource string or message itself).
+    /// </param>
     /// <param name="exception">Exception, which must be written.</param>
     public virtual void FatalError(string messageId, object[] parameters = null, Exception exception = null) =>
       Write(LogLevel.FatalError, messageId, parameters, exception);

Orm/Xtensive.Orm/Orm/Logging/IndentManager.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2023 Xtensive LLC.
+// Copyright (C) 2013-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov

Orm/Xtensive.Orm/Orm/Logging/Internals/ConsoleWriter.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2013 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2013-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
 // Created:    2013.09.27
 

Orm/Xtensive.Orm/Orm/Logging/Internals/DebugOnlyConsoleWriter.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2013 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2013-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
 // Created:    2013.09.27