From 495dc90c10103763038224227a221b1b186ce0d3 Mon Sep 17 00:00:00 2001 From: Ahmed ElSayed Date: Wed, 9 Mar 2016 12:02:57 -0800 Subject: [PATCH] Fix test case for logStreaming --- Kudu.FunctionalTests/LogStreamManagerTests.cs | 7 +++++-- Kudu.Services/Diagnostics/LogStreamManager.cs | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Kudu.FunctionalTests/LogStreamManagerTests.cs b/Kudu.FunctionalTests/LogStreamManagerTests.cs index 8aa6ef070..145d2b43f 100644 --- a/Kudu.FunctionalTests/LogStreamManagerTests.cs +++ b/Kudu.FunctionalTests/LogStreamManagerTests.cs @@ -120,8 +120,11 @@ public void TestLogStreamNotFound() ApplicationManager.Run(appName, appManager => { RemoteLogStreamManager manager = new RemoteLogStreamManager(appManager.ServiceUrl + "/logstream/notfound"); - var ex = KuduAssert.ThrowsUnwrapped(() => manager.GetStream().Wait()); - Assert.Equal(((HttpWebResponse)ex.Response).StatusCode, HttpStatusCode.NotFound); + using (var waitHandle = new LogStreamWaitHandle(manager.GetStream().Result)) + { + string line = waitHandle.WaitNextLine(10000); + Assert.True(!String.IsNullOrEmpty(line) && line.Contains("Welcome"), "check welcome message: " + line); + } }); } diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs index b4c002783..a57ac86a8 100644 --- a/Kudu.Services/Diagnostics/LogStreamManager.cs +++ b/Kudu.Services/Diagnostics/LogStreamManager.cs @@ -276,6 +276,12 @@ private string ParseRequest(HttpContext context) return _logPath; } + var firstPath = routePath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); + if (string.Equals(firstPath, "Application", StringComparison.OrdinalIgnoreCase)) + { + _enableTrace = true; + } + return FileSystemHelpers.EnsureDirectory(Path.Combine(_logPath, routePath)); }