fixing #26: code cleanup

aspnet · Oct 2, 2014 · ec769fd · ec769fd
1 parent a1d27a1
commit ec769fd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/src/Microsoft.Framework.Logging.Interfaces/ILoggerFactory.cs b/src/Microsoft.Framework.Logging.Interfaces/ILoggerFactory.cs
@@ -20,4 +20,4 @@ public interface ILoggerFactory
 
         void AddProvider(ILoggerProvider provider);
     }
-}
+}
diff --git a/src/Microsoft.Framework.Logging/DiagnosticsScope.cs b/src/Microsoft.Framework.Logging/DiagnosticsScope.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Framework.Logging
     public class DiagnosticsScope : IDisposable
     {
         // To detect redundant calls
-        private bool _disposedValue;
+        private bool _isDisposed;
 
         /// <summary>
         /// Pushes state onto the LogicalOperationStack by calling 
@@ -34,14 +34,14 @@ public DiagnosticsScope(object state)
         /// <param name="state">The state.</param>
         public void Dispose()
         {
-            if (!_disposedValue)
+            if (!_isDisposed)
             {
 #if NET45 || ASPNET50
                 Trace.CorrelationManager.StopLogicalOperation();
 #endif
-                _disposedValue = true;
+                _isDisposed = true;
             }
         }
     }
 }
-#endif
+#endif
diff --git a/src/Microsoft.Framework.Logging/Logger.cs b/src/Microsoft.Framework.Logging/Logger.cs
@@ -8,8 +8,8 @@ namespace Microsoft.Framework.Logging
 {
     internal class Logger : ILogger
     {
-        private LoggerFactory _loggerFactory;
-        private string _name;
+        private readonly LoggerFactory _loggerFactory;
+        private readonly string _name;
         private ILogger[] _loggers = new ILogger[0];
 
         public Logger(LoggerFactory loggerFactory, string name)
@@ -19,7 +19,7 @@ public Logger(LoggerFactory loggerFactory, string name)
 
             var providers = loggerFactory.GetProviders();
             _loggers = new ILogger[providers.Length];
-            for (var index = 0; index != providers.Length; ++index)
+            for (var index = 0; index != providers.Length; index++)
             {
                 _loggers[index] = providers[index].Create(name);
             }
@@ -29,7 +29,7 @@ public bool WriteCore(TraceType eventType, int eventId, object state, Exception
         {
             var result = false;
             var count = _loggers.Length;
-            for (var index = 0; index != count; ++index)
+            for (var index = 0; index != count; index++)
             {
                 result |= _loggers[index].WriteCore(eventType, eventId, state, exception, formatter);
             }
@@ -40,7 +40,7 @@ public IDisposable BeginScope(object state)
         {
             var count = _loggers.Length;
             var scope = new Scope(count);
-            for (var index = 0; index != count; ++index)
+            for (var index = 0; index != count; index++)
             {
                 scope.SetDisposable(index, _loggers[index].BeginScope(state));
             }
@@ -55,7 +55,7 @@ internal void AddProvider(ILoggerProvider provider)
 
         private class Scope : IDisposable
         {
-            private bool disposedValue = false; 
+            private bool _isDisposed; 
 
             private IDisposable _disposable0;
             private IDisposable _disposable1;
@@ -87,7 +87,7 @@ public void SetDisposable(int index, IDisposable disposable)
 
             protected virtual void Dispose(bool disposing)
             {
-                if (!disposedValue)
+                if (!_isDisposed)
                 {
                     if (disposing)
                     {
@@ -112,7 +112,7 @@ protected virtual void Dispose(bool disposing)
                         }
                     }
 
-                    disposedValue = true;
+                    _isDisposed = true;
                 }
             }
 
@@ -131,4 +131,4 @@ internal void Add(IDisposable disposable)
             }
         }
     }
-}
+}
diff --git a/src/Microsoft.Framework.Logging/LoggerFactory.cs b/src/Microsoft.Framework.Logging/LoggerFactory.cs
@@ -12,9 +12,9 @@ namespace Microsoft.Framework.Logging
     /// </summary>
     public class LoggerFactory : ILoggerFactory
     {
-        Dictionary<string, Logger> _loggers = new Dictionary<string, Logger>(StringComparer.Ordinal);
-        ILoggerProvider[] _providers = new ILoggerProvider[0];
-        object _sync = new object();
+        private readonly Dictionary<string, Logger> _loggers = new Dictionary<string, Logger>(StringComparer.Ordinal);
+        private ILoggerProvider[] _providers = new ILoggerProvider[0];
+        private readonly object _sync = new object();
 
         public ILogger Create(string name)
         {
@@ -47,6 +47,4 @@ internal ILoggerProvider[] GetProviders()
             return _providers;
         }
     }
-
-
 }
diff --git a/...ork.Logging.Test/DiagnosticsScopeTests.cs → ...work.Logging.Test/DiagnosticsScopeTest.cs b/...ork.Logging.Test/DiagnosticsScopeTests.cs → ...work.Logging.Test/DiagnosticsScopeTest.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.Framework.Logging.Test
 {
-    public class DiagnosticsScopeTests
+    public class DiagnosticsScopeTest
     {
 #if ASPNET50
         [Fact]
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ public interface ILoggerFactory @@
             void AddProvider(ILoggerProvider provider);
         }
-    }
+    }