@if (!activity.RepresentsScope)
@@ -227,7 +227,7 @@
| @activity.Time.ToString("MM-dd-yyyy HH:mm:ss") |
@foreach (var kvp in counts)
{
- if (string.Equals("Verbose", kvp.Key)) {
+ if (string.Equals("Debug", kvp.Key)) {
@kvp.Value @kvp.Keyv |
}
else
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/Shared.css b/src/Microsoft.AspNet.Diagnostics.Elm/Views/Shared.css
index 7f35534317..18c14c10d1 100644
--- a/src/Microsoft.AspNet.Diagnostics.Elm/Views/Shared.css
+++ b/src/Microsoft.AspNet.Diagnostics.Elm/Views/Shared.css
@@ -30,7 +30,7 @@ tr:nth-child(2n) {
color: blue;
}
-.verbose {
+.debug {
color: black;
}
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
index a105563590..deb51bd8f5 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
@@ -93,7 +93,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
var creator = dbContext.GetService() as IRelationalDatabaseCreator;
if (creator == null)
{
- _logger.LogVerbose(Strings.DatabaseErrorPage_NotRelationalDatabase);
+ _logger.LogDebug(Strings.DatabaseErrorPage_NotRelationalDatabase);
}
else
{
@@ -140,11 +140,11 @@ namespace Microsoft.AspNet.Diagnostics.Entity
private static bool ShouldDisplayErrorPage(DataStoreErrorLogger.DataStoreErrorLog lastError, Exception exception, ILogger logger)
{
- logger.LogVerbose(Strings.FormatDatabaseErrorPage_AttemptingToMatchException(exception.GetType()));
+ logger.LogDebug(Strings.FormatDatabaseErrorPage_AttemptingToMatchException(exception.GetType()));
if (!lastError.IsErrorLogged)
{
- logger.LogVerbose(Strings.DatabaseErrorPage_NoRecordedException);
+ logger.LogDebug(Strings.DatabaseErrorPage_NoRecordedException);
return false;
}
@@ -156,11 +156,11 @@ namespace Microsoft.AspNet.Diagnostics.Entity
if (!match)
{
- logger.LogVerbose(Strings.DatabaseErrorPage_NoMatch);
+ logger.LogDebug(Strings.DatabaseErrorPage_NoMatch);
return false;
}
- logger.LogVerbose(Strings.DatabaseErrorPage_Matched);
+ logger.LogDebug(Strings.DatabaseErrorPage_Matched);
return true;
}
}
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs
index d1be0df65a..078e41465e 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs
@@ -58,14 +58,14 @@ namespace Microsoft.AspNet.Diagnostics.Entity
if (context.Request.Path.Equals(_options.Path))
{
- _logger.LogVerbose(Strings.FormatMigrationsEndPointMiddleware_RequestPathMatched(context.Request.Path));
+ _logger.LogDebug(Strings.FormatMigrationsEndPointMiddleware_RequestPathMatched(context.Request.Path));
var db = await GetDbContext(context, _logger);
if (db != null)
{
try
{
- _logger.LogVerbose(Strings.FormatMigrationsEndPointMiddleware_ApplyingMigrations(db.GetType().FullName));
+ _logger.LogDebug(Strings.FormatMigrationsEndPointMiddleware_ApplyingMigrations(db.GetType().FullName));
db.Database.Migrate();
@@ -73,7 +73,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
context.Response.Headers.Add("Pragma", new[] { "no-cache" });
context.Response.Headers.Add("Cache-Control", new[] { "no-cache" });
- _logger.LogVerbose(Strings.FormatMigrationsEndPointMiddleware_Applied(db.GetType().FullName));
+ _logger.LogDebug(Strings.FormatMigrationsEndPointMiddleware_Applied(db.GetType().FullName));
}
catch (Exception ex)
{
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs
index 01166acb4f..fcc70073f5 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs
@@ -67,14 +67,15 @@ namespace Microsoft.AspNet.Diagnostics.Tests
var store = t.Item2;
// Act
- logger.Log(LogLevel.Verbose, 0, _state, null, null);
+ logger.Log(LogLevel.Trace, 0, _state, null, null);
+ logger.Log(LogLevel.Debug, 0, _state, null, null);
logger.Log(LogLevel.Information, 0, _state, null, null);
logger.Log(LogLevel.Warning, 0, _state, null, null);
logger.Log(LogLevel.Error, 0, _state, null, null);
logger.Log(LogLevel.Critical, 0, _state, null, null);
// Assert
- Assert.Equal(5, (store.GetActivities().SelectMany(a => NodeLogs(a.Root, new List()))).ToList().Count);
+ Assert.Equal(6, (store.GetActivities().SelectMany(a => NodeLogs(a.Root, new List()))).ToList().Count);
}
[Theory]
@@ -83,7 +84,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests
[InlineData(LogLevel.Warning, "bad", 0)]
[InlineData(LogLevel.Critical, "", 1)]
[InlineData(LogLevel.Critical, "test", 1)]
- [InlineData(LogLevel.Verbose, "t", 5)]
+ [InlineData(LogLevel.Trace, "t", 6)]
public void Filter_LogsWhenAppropriate(LogLevel minLevel, string prefix, int count)
{
// Arrange
@@ -92,7 +93,8 @@ namespace Microsoft.AspNet.Diagnostics.Tests
var store = t.Item2;
// Act
- logger.Log(LogLevel.Verbose, 0, _state, null, null);
+ logger.Log(LogLevel.Trace, 0, _state, null, null);
+ logger.Log(LogLevel.Debug, 0, _state, null, null);
logger.Log(LogLevel.Information, 0, _state, null, null);
logger.Log(LogLevel.Warning, 0, _state, null, null);
logger.Log(LogLevel.Error, 0, _state, null, null);
@@ -248,7 +250,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests
{
using (logger.BeginScope("test7"))
{
- logger.LogVerbose("hi");
+ logger.LogTrace("hi");
}
}
@@ -267,7 +269,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests
// Act
using (logger.BeginScope("test8"))
{
- logger.LogVerbose("hi");
+ logger.LogDebug("hi");
using (logger.BeginScope("test9"))
{
}
@@ -331,20 +333,20 @@ namespace Microsoft.AspNet.Diagnostics.Tests
{
for (var i = 0; i < 5; i++)
{
- _logger.LogVerbose(string.Format("xxx {0}", i));
+ _logger.LogDebug(string.Format("xxx {0}", i));
Thread.Sleep(5);
}
using (_logger.BeginScope("test13"))
{
for (var i = 0; i < 3; i++)
{
- _logger.LogVerbose(string.Format("yyy {0}", i));
+ _logger.LogDebug(string.Format("yyy {0}", i));
Thread.Sleep(200);
}
}
for (var i = 0; i < 7; i++)
{
- _logger.LogVerbose(string.Format("zzz {0}", i));
+ _logger.LogDebug(string.Format("zzz {0}", i));
Thread.Sleep(40);
}
}