WIP

Victor Hurdugaci · Victor Hurdugaci · commit ff8a12042197 · 2016-07-28T11:12:40.000-07:00
diff --git a/src/Microsoft.Extensions.Logging.AzureWebAppDiagnostics/Internal/BackgroundSink.cs b/src/Microsoft.Extensions.Logging.AzureWebAppDiagnostics/Internal/BackgroundSink.cs
@@ -74,19 +74,16 @@ public void Emit(LogEvent logEvent)
         /// </summary>
         public virtual void Dispose()
         {
-            if (!_disposedTokenSource.IsCancellationRequested)
+            lock (_disposedTokenSource)
             {
-                lock (_disposedTokenSource)
+                if (!_disposedTokenSource.IsCancellationRequested)
                 {
-                    if (!_disposedTokenSource.IsCancellationRequested)
-                    {
-                        _disposedTokenSource.Cancel();
-                    }
-
-                    // Wait for the thread to complete before disposing the resources
-                    _workerThread.Join();
-                    _messages.Dispose();
+                    _disposedTokenSource.Cancel();
                 }
+
+                // Wait for the thread to complete before disposing the resources
+                _workerThread.Join();
+                _messages.Dispose();
             }
         }
 
diff --git a/src/Microsoft.Extensions.Logging.AzureWebAppDiagnostics/Internal/WebAppLogConfigurationReader.cs b/src/Microsoft.Extensions.Logging.AzureWebAppDiagnostics/Internal/WebAppLogConfigurationReader.cs
@@ -34,7 +34,7 @@ public WebAppLogConfigurationReader(IWebAppContext context)
             else
             {
                 _fileLogFolder = Path.Combine(context.HomeFolder, "LogFiles", "Application");
-                var settingsFolder = Path.Combine(context.HomeFolder, "Diagnostics");
+                var settingsFolder = Path.Combine(context.HomeFolder, "site", "diagnostics");
                 var settingsFile = Path.Combine(settingsFolder, "settings.json");
 
                 // TODO: This is a workaround because the file provider doesn't handle missing folders/files
diff --git a/test/Microsoft.Extensions.Logging.AzureWebAppDiagnostics.Test/BackgroundSinkTests.cs b/test/Microsoft.Extensions.Logging.AzureWebAppDiagnostics.Test/BackgroundSinkTests.cs
@@ -21,7 +21,7 @@ public void MessagesOrderIsMaintained()
             var testSink = new TestSink();
 
             using (var allLogged = new ManualResetEvent(false))
-            using (var backgroundSink = new BackgroundSink(testSink, BackgroundSink.DefaultQueueSize))
+            using (var backgroundSink = new BackgroundSink(testSink, BackgroundSink.DefaultLogMessagesQueueSize))
             {
                 testSink.Events.CollectionChanged += (sender, e) =>
                 {
diff --git a/test/Microsoft.Extensions.Logging.AzureWebAppDiagnostics.Test/LogConfigurationReaderTests.cs b/test/Microsoft.Extensions.Logging.AzureWebAppDiagnostics.Test/LogConfigurationReaderTests.cs
@@ -23,7 +23,7 @@ public void OutsideOfWebAppTheConfigurationIsDisabled()
             
             var configReader = new WebAppLogConfigurationReader(contextMock.Object);
 
-            Assert.Same(WebAppLogConfiguration.Disabled, configReader.Latest);
+            Assert.Same(WebAppLogConfiguration.Disabled, configReader.Current);
         }
 
         [Fact]
@@ -41,7 +41,7 @@ public void NoConfigFile()
 
             using (var configReader = new WebAppLogConfigurationReader(contextMock.Object))
             {
-                var config = configReader.Latest;
+                var config = configReader.Current;
 
                 Assert.True(config.IsRunningInWebApp);
 
@@ -64,7 +64,7 @@ public void ConfigurationDisabledInSettingsFile()
             {
                 var logFolder = Path.Combine(tempFolder, "LogFiles", "Application");
 
-                var settingsFolder = Path.Combine(tempFolder, "Diagnostics");
+                var settingsFolder = Path.Combine(tempFolder, "site", "diagnostics");
                 var settingsFile = Path.Combine(settingsFolder, "settings.json");
 
                 if (!Directory.Exists(settingsFolder))
@@ -91,7 +91,7 @@ public void ConfigurationDisabledInSettingsFile()
 
                 using (var configReader = new WebAppLogConfigurationReader(contextMock.Object))
                 {
-                    var config = configReader.Latest;
+                    var config = configReader.Current;
 
                     Assert.False(config.FileLoggingEnabled);
                     Assert.Equal(LogLevel.Trace, config.FileLoggingLevel);
@@ -125,7 +125,7 @@ public void ConfigurationChange()
             {
                 var logFolder = Path.Combine(tempFolder, "LogFiles", "Application");
 
-                var settingsFolder = Path.Combine(tempFolder, "Diagnostics");
+                var settingsFolder = Path.Combine(tempFolder, "site", "diagnostics");
                 var settingsFile = Path.Combine(settingsFolder, "settings.json");
 
                 if (!Directory.Exists(settingsFolder))
@@ -180,7 +180,7 @@ public void ConfigurationChange()
                     var configChanged = configChangedEvent.WaitOne(DefaultTimeout);
 
                     Assert.True(configChanged);
-                    Assert.Same(config, configReader.Latest);
+                    Assert.Same(config, configReader.Current);
 
                     Assert.False(config.FileLoggingEnabled);
                     Assert.Equal(LogLevel.Information, config.FileLoggingLevel);
diff --git a/test/Microsoft.Extensions.Logging.AzureWebAppDiagnostics.Test/SerilogLoggerProviderTests.cs b/test/Microsoft.Extensions.Logging.AzureWebAppDiagnostics.Test/SerilogLoggerProviderTests.cs
@@ -17,7 +17,7 @@ public class SerilogLoggerProviderTests
         public void OnStartDisable()
         {
             var configReader = new Mock<IWebAppLogConfigurationReader>();
-            configReader.SetupGet(m => m.Latest).Returns(WebAppLogConfiguration.Disabled);
+            configReader.SetupGet(m => m.Current).Returns(WebAppLogConfiguration.Disabled);
 
             // Nothing should be called on this object
             var testSink = new Mock<ILogEventSink>(MockBehavior.Strict);
@@ -33,7 +33,7 @@ public void OnStartDisable()
         public void OnStartLoggingLevel()
         {
             var configReader = new Mock<IWebAppLogConfigurationReader>();
-            configReader.SetupGet(m => m.Latest)
+            configReader.SetupGet(m => m.Current)
                 .Returns(new WebAppLogConfiguration(fileLoggingEnabled: true, fileLoggingLevel: LogLevel.Information));
 
             var testSink = new Mock<ILogEventSink>(MockBehavior.Strict);
@@ -54,7 +54,7 @@ public void DynamicDisable()
             var currentConfig = new WebAppLogConfiguration(fileLoggingEnabled: true, fileLoggingLevel: LogLevel.Information);
 
             var configReader = new Mock<IWebAppLogConfigurationReader>();
-            configReader.SetupGet(m => m.Latest)
+            configReader.SetupGet(m => m.Current)
                 .Returns(() => { return currentConfig; });
 
             var testSink = new Mock<ILogEventSink>(MockBehavior.Strict);
@@ -82,7 +82,7 @@ public void DynamicLoggingLevel()
             var currentConfig = new WebAppLogConfiguration(fileLoggingEnabled: true, fileLoggingLevel: LogLevel.Critical);
 
             var configReader = new Mock<IWebAppLogConfigurationReader>();
-            configReader.SetupGet(m => m.Latest)
+            configReader.SetupGet(m => m.Current)
                 .Returns(() => { return currentConfig; });
 
             var testSink = new Mock<ILogEventSink>(MockBehavior.Strict);
@@ -111,7 +111,7 @@ public void LevelMapping()
             var currentConfig = new WebAppLogConfiguration(fileLoggingEnabled: true);
 
             var configReader = new Mock<IWebAppLogConfigurationReader>();
-            configReader.SetupGet(m => m.Latest)
+            configReader.SetupGet(m => m.Current)
                 .Returns(() => { return currentConfig; });
 
             var testSink = new Mock<ILogEventSink>(MockBehavior.Strict);

Original file line number	Diff line number	Diff line change
`@@ -74,19 +74,16 @@ public void Emit(LogEvent logEvent)`
`74`	`74`	`/// </summary>`
`75`	`75`	`public virtual void Dispose()`
`76`	`76`	`{`
`77`		`- if (!_disposedTokenSource.IsCancellationRequested)`
	`77`	`+ lock (_disposedTokenSource)`
`78`	`78`	`{`
`79`		`- lock (_disposedTokenSource)`
	`79`	`+ if (!_disposedTokenSource.IsCancellationRequested)`
`80`	`80`	`{`
`81`		`- if (!_disposedTokenSource.IsCancellationRequested)`
`82`		`- {`
`83`		`- _disposedTokenSource.Cancel();`
`84`		`- }`
`85`		`-`
`86`		`- // Wait for the thread to complete before disposing the resources`
`87`		`- _workerThread.Join();`
`88`		`- _messages.Dispose();`
	`81`	`+ _disposedTokenSource.Cancel();`
`89`	`82`	`}`
	`83`	`+`
	`84`	`+ // Wait for the thread to complete before disposing the resources`
	`85`	`+ _workerThread.Join();`
	`86`	`+ _messages.Dispose();`
`90`	`87`	`}`
`91`	`88`	`}`
`92`	`89`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public WebAppLogConfigurationReader(IWebAppContext context)`
`34`	`34`	`else`
`35`	`35`	`{`
`36`	`36`	`_fileLogFolder = Path.Combine(context.HomeFolder, "LogFiles", "Application");`
`37`		`- var settingsFolder = Path.Combine(context.HomeFolder, "Diagnostics");`
	`37`	`+ var settingsFolder = Path.Combine(context.HomeFolder, "site", "diagnostics");`
`38`	`38`	`var settingsFile = Path.Combine(settingsFolder, "settings.json");`
`39`	`39`
`40`	`40`	`// TODO: This is a workaround because the file provider doesn't handle missing folders/files`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public void MessagesOrderIsMaintained()`
`21`	`21`	`var testSink = new TestSink();`
`22`	`22`
`23`	`23`	`using (var allLogged = new ManualResetEvent(false))`
`24`		`- using (var backgroundSink = new BackgroundSink(testSink, BackgroundSink.DefaultQueueSize))`
	`24`	`+ using (var backgroundSink = new BackgroundSink(testSink, BackgroundSink.DefaultLogMessagesQueueSize))`
`25`	`25`	`{`
`26`	`26`	`testSink.Events.CollectionChanged += (sender, e) =>`
`27`	`27`	`{`