incorporated feedback

aspnet · Oct 7, 2014 · fcbcda7 · davidfowl · Oct 7, 2014 · fcbcda7
1 parent 44c6278
commit fcbcda7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 26 deletions.
diff --git a/src/Microsoft.Framework.Logging.NLog/NLogLoggerProvider.cs b/src/Microsoft.Framework.Logging.NLog/NLogLoggerProvider.cs
@@ -50,10 +50,10 @@ public void Write(
                     }
                     if (exception != null)
                     {
-                        message += "\r\n" + exception;
+                        message += Environment.NewLine + exception;
                     }
                 }
-                if (message != String.Empty)
+                if (!String.IsNullOrEmpty(message))
                 {
                     var eventInfo = LogEventInfo.Create(logLevel, _logger.Name, message, exception);
                     eventInfo.Properties["EventId"] = eventId;

diff --git a/src/Microsoft.Framework.Logging/DiagnosticsLogger.cs b/src/Microsoft.Framework.Logging/DiagnosticsLogger.cs
@@ -37,10 +37,10 @@ public void Write(TraceType traceType, int eventId, object state, Exception exce
                 }
                 if (exception != null)
                 {
-                    message += "\r\n" + exception;
+                    message += Environment.NewLine + exception;
                 }
             }
-            if (message != String.Empty)
+            if (!String.IsNullOrEmpty(message))
             {
                 _traceSource.TraceEvent(eventType, eventId, message);
             }

diff --git a/src/Microsoft.Framework.Logging/Logger.cs b/src/Microsoft.Framework.Logging/Logger.cs
@@ -27,24 +27,15 @@ public Logger(LoggerFactory loggerFactory, string name)
 
         public void Write(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
         {
-            var count = _loggers.Length;
-            for (var index = 0; index != count; index++)
+            for (var index = 0; index < _loggers.Length; index++)
             {
                 _loggers[index].Write(eventType, eventId, state, exception, formatter);
             }
         }
 
         public bool IsEnabled(TraceType eventType)
         {
-            var count = _loggers.Length;
-            for (var index = 0; index != count; index++)
-            {
-                if (_loggers[index].IsEnabled(eventType))
-                {
-                    return true;
-                }
-            }
-            return false;
+            return _loggers.Any(l => l.IsEnabled(eventType));
         }
 
         public IDisposable BeginScope(object state)

diff --git a/src/Microsoft.Framework.Logging/LoggerExtensions.cs b/src/Microsoft.Framework.Logging/LoggerExtensions.cs
@@ -13,7 +13,8 @@ namespace Microsoft.Framework.Logging
     public static class LoggerExtensions
     {
         private static readonly Func<object, Exception, string> TheMessage = (message, error) => (string)message;
-        private static readonly Func<object, Exception, string> TheMessageAndError = (message, error) => string.Format(CultureInfo.CurrentCulture, "{0}\r\n{1}", message, error);
+        private static readonly Func<object, Exception, string> TheMessageAndError = (message, error) 
+            => string.Format(CultureInfo.CurrentCulture, "{0}{1}{2}", message, Environment.NewLine, error);
 
         /// <summary>
         /// Writes a verbose log message.

diff --git a/test/Microsoft.Framework.Logging.Test/DiagnosticsLoggerTest.cs b/test/Microsoft.Framework.Logging.Test/DiagnosticsLoggerTest.cs
@@ -16,19 +16,19 @@ public class DiagnosticsLoggerTest
         [Fact]
         public static void IsEnabledReturnsCorrectValue()
         {
-            SourceSwitch testSwitch = new SourceSwitch("TestSwitch", "Level will be set to warning for this test");
+            var testSwitch = new SourceSwitch("TestSwitch", "Level will be set to warning for this test");
             testSwitch.Level = SourceLevels.Warning;
 
             var factory = new LoggerFactory();
-            ILogger logger = factory.Create("Test");
+            var logger = factory.Create("Test");
 
             factory.AddProvider(new DiagnosticsLoggerProvider(testSwitch, new ConsoleTraceListener()));
 
-            Assert.Equal(true, logger.IsEnabled(TraceType.Critical));
-            Assert.Equal(true, logger.IsEnabled(TraceType.Error));
-            Assert.Equal(true, logger.IsEnabled(TraceType.Warning));
-            Assert.Equal(false, logger.IsEnabled(TraceType.Information));
-            Assert.Equal(false, logger.IsEnabled(TraceType.Verbose));
+            Assert.True(logger.IsEnabled(TraceType.Critical));
+            Assert.True(logger.IsEnabled(TraceType.Error));
+            Assert.True(logger.IsEnabled(TraceType.Warning));
+            Assert.False(logger.IsEnabled(TraceType.Information));
+            Assert.False(logger.IsEnabled(TraceType.Verbose));
         }
 
         [Theory]
@@ -38,14 +38,14 @@ public static void IsEnabledReturnsCorrectValue()
         [InlineData(SourceLevels.Warning, SourceLevels.Warning, false)]
         public static void MultipleLoggers_IsEnabledReturnsCorrectValue(SourceLevels first, SourceLevels second, bool expected)
         {
-            SourceSwitch firstSwitch = new SourceSwitch("FirstSwitch", "First Test Switch");
+            var firstSwitch = new SourceSwitch("FirstSwitch", "First Test Switch");
             firstSwitch.Level = first;
 
-            SourceSwitch secondSwitch = new SourceSwitch("SecondSwitch", "Second Test Switch");
+            var secondSwitch = new SourceSwitch("SecondSwitch", "Second Test Switch");
             secondSwitch.Level = second;
 
             var factory = new LoggerFactory();
-            ILogger logger = factory.Create("Test");
+            var logger = factory.Create("Test");
 
             factory.AddProvider(new DiagnosticsLoggerProvider(firstSwitch, new ConsoleTraceListener()));
             factory.AddProvider(new DiagnosticsLoggerProvider(secondSwitch, new ConsoleTraceListener()));