huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Collapsed Logs

This commit is contained in:
SonjaKhan 2014-12-01 14:09:06 -08:00
parent cb6639c818
commit 71a4c18598
6 changed files with 309 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
samples/ErrorHandlerSample/ErrorHandlerSample.kproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@ -12,6 +12,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<DevelopmentServerPort>62671</DevelopmentServerPort>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>

3
samples/RuntimeInfoPageSample/RuntimeInfoPageSample.kproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@ -12,6 +12,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<DevelopmentServerPort>62670</DevelopmentServerPort>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>

1
src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs
View File

@ -57,7 +57,6 @@ namespace Microsoft.AspNet.Diagnostics.Elm
{ {
var model = new LogPageModel() var model = new LogPageModel()
{ {
// sort so most recent logs are first
Activities = _store.GetActivities(), Activities = _store.GetActivities(),
Options = options, Options = options,
Path = _options.Path Path = _options.Path

313
src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cs
View File

@ -7,36 +7,42 @@ using System
#line hidden #line hidden
; ;
#line 2 "LogPage.cshtml" #line 2 "LogPage.cshtml"
using System.Globalization using System.Collections.Generic
#line default #line default
#line hidden #line hidden
; ;
#line 3 "LogPage.cshtml" #line 3 "LogPage.cshtml"
using System.Linq using System.Globalization
#line default #line default
#line hidden #line hidden
; ;
#line 4 "LogPage.cshtml" #line 4 "LogPage.cshtml"
using Microsoft.AspNet.Diagnostics.Elm.Views using System.Linq
#line default #line default
#line hidden #line hidden
; ;
#line 5 "LogPage.cshtml" #line 5 "LogPage.cshtml"
using Microsoft.AspNet.Diagnostics.Elm using Microsoft.AspNet.Diagnostics.Elm.Views
#line default #line default
#line hidden #line hidden
; ;
#line 6 "LogPage.cshtml" #line 6 "LogPage.cshtml"
using Microsoft.AspNet.Diagnostics.Views using Microsoft.AspNet.Diagnostics.Elm
#line default #line default
#line hidden #line hidden
; ;
#line 7 "LogPage.cshtml" #line 7 "LogPage.cshtml"
using Microsoft.AspNet.Diagnostics.Views
#line default
#line hidden
;
#line 8 "LogPage.cshtml"
using Microsoft.Framework.Logging using Microsoft.Framework.Logging
#line default #line default
@ -47,13 +53,13 @@ using Microsoft.Framework.Logging
public class LogPage : Microsoft.AspNet.Diagnostics.Views.BaseView public class LogPage : Microsoft.AspNet.Diagnostics.Views.BaseView
{ {
public HelperResult public HelperResult
#line 20 "LogPage.cshtml" #line 21 "LogPage.cshtml"
LogRow(LogInfo log, int level) { LogRow(LogInfo log, int level) {
#line default #line default
#line hidden #line hidden
return new HelperResult((__razor_helper_writer) => { return new HelperResult((__razor_helper_writer) => {
#line 20 "LogPage.cshtml" #line 21 "LogPage.cshtml"
if (log.Severity >= Model.Options.MinLevel && if (log.Severity >= Model.Options.MinLevel &&
(string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal))) (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
@ -63,46 +69,46 @@ LogRow(LogInfo log, int level) {
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, " <tr class=\"logRow\">\r\n <td>"); WriteLiteralTo(__razor_helper_writer, " <tr class=\"logRow\">\r\n <td>");
#line 25 "LogPage.cshtml" #line 26 "LogPage.cshtml"
WriteTo(__razor_helper_writer, string.Format("{0:MM/dd/yy}", log.Time)); WriteTo(__razor_helper_writer, string.Format("{0:MM/dd/yy}", log.Time));
#line default #line default
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, "</td>\r\n <td>"); WriteLiteralTo(__razor_helper_writer, "</td>\r\n <td>");
#line 26 "LogPage.cshtml" #line 27 "LogPage.cshtml"
WriteTo(__razor_helper_writer, string.Format("{0:H:mm:ss}", log.Time)); WriteTo(__razor_helper_writer, string.Format("{0:H:mm:ss}", log.Time));
#line default #line default
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, "</td>\r\n <td"); WriteLiteralTo(__razor_helper_writer, "</td>\r\n <td");
WriteAttributeTo(__razor_helper_writer, "title", Tuple.Create(" title=\"", 836), Tuple.Create("\"", 853), WriteAttributeTo(__razor_helper_writer, "title", Tuple.Create(" title=\"", 871), Tuple.Create("\"", 888),
Tuple.Create(Tuple.Create("", 844), Tuple.Create<System.Object, System.Int32>(log.Name, 844), false)); Tuple.Create(Tuple.Create("", 879), Tuple.Create<System.Object, System.Int32>(log.Name, 879), false));
WriteLiteralTo(__razor_helper_writer, ">"); WriteLiteralTo(__razor_helper_writer, ">");
#line 27 "LogPage.cshtml" #line 28 "LogPage.cshtml"
WriteTo(__razor_helper_writer, log.Name); WriteTo(__razor_helper_writer, log.Name);
#line default #line default
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, "</td>\r\n <td"); WriteLiteralTo(__razor_helper_writer, "</td>\r\n <td");
WriteAttributeTo(__razor_helper_writer, "class", Tuple.Create(" class=\"", 886), Tuple.Create("\"", 937), WriteAttributeTo(__razor_helper_writer, "class", Tuple.Create(" class=\"", 921), Tuple.Create("\"", 972),
Tuple.Create(Tuple.Create("", 894), Tuple.Create<System.Object, System.Int32>(log.Severity.ToString().ToLowerInvariant(), 894), false)); Tuple.Create(Tuple.Create("", 929), Tuple.Create<System.Object, System.Int32>(log.Severity.ToString().ToLowerInvariant(), 929), false));
WriteLiteralTo(__razor_helper_writer, ">"); WriteLiteralTo(__razor_helper_writer, ">");
#line 28 "LogPage.cshtml" #line 29 "LogPage.cshtml"
WriteTo(__razor_helper_writer, log.Severity); WriteTo(__razor_helper_writer, log.Severity);
#line default #line default
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, "</td>\r\n <td"); WriteLiteralTo(__razor_helper_writer, "</td>\r\n <td");
WriteAttributeTo(__razor_helper_writer, "title", Tuple.Create(" title=\"", 974), Tuple.Create("\"", 994), WriteAttributeTo(__razor_helper_writer, "title", Tuple.Create(" title=\"", 1009), Tuple.Create("\"", 1029),
Tuple.Create(Tuple.Create("", 982), Tuple.Create<System.Object, System.Int32>(log.Message, 982), false)); Tuple.Create(Tuple.Create("", 1017), Tuple.Create<System.Object, System.Int32>(log.Message, 1017), false));
WriteLiteralTo(__razor_helper_writer, ">\r\n"); WriteLiteralTo(__razor_helper_writer, ">\r\n");
#line 30 "LogPage.cshtml" #line 31 "LogPage.cshtml"
#line default #line default
#line hidden #line hidden
#line 30 "LogPage.cshtml" #line 31 "LogPage.cshtml"
for (var i = 0; i < level; i++) for (var i = 0; i < level; i++)
{ {
@ -110,29 +116,29 @@ WriteTo(__razor_helper_writer, string.Format("{0:H:mm:ss}", log.Time));
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, " <span class=\"tab\"></span>\r\n"); WriteLiteralTo(__razor_helper_writer, " <span class=\"tab\"></span>\r\n");
#line 33 "LogPage.cshtml" #line 34 "LogPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, " "); WriteLiteralTo(__razor_helper_writer, " ");
#line 34 "LogPage.cshtml" #line 35 "LogPage.cshtml"
WriteTo(__razor_helper_writer, log.Message); WriteTo(__razor_helper_writer, log.Message);
#line default #line default
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, "\r\n </td>\r\n <td"); WriteLiteralTo(__razor_helper_writer, "\r\n </td>\r\n <td");
WriteAttributeTo(__razor_helper_writer, "title", Tuple.Create(" title=\"", 1197), Tuple.Create("\"", 1219), WriteAttributeTo(__razor_helper_writer, "title", Tuple.Create(" title=\"", 1232), Tuple.Create("\"", 1254),
Tuple.Create(Tuple.Create("", 1205), Tuple.Create<System.Object, System.Int32>(log.Exception, 1205), false)); Tuple.Create(Tuple.Create("", 1240), Tuple.Create<System.Object, System.Int32>(log.Exception, 1240), false));
WriteLiteralTo(__razor_helper_writer, ">"); WriteLiteralTo(__razor_helper_writer, ">");
#line 36 "LogPage.cshtml" #line 37 "LogPage.cshtml"
WriteTo(__razor_helper_writer, log.Exception); WriteTo(__razor_helper_writer, log.Exception);
#line default #line default
#line hidden #line hidden
WriteLiteralTo(__razor_helper_writer, "</td>\r\n </tr>\r\n"); WriteLiteralTo(__razor_helper_writer, "</td>\r\n </tr>\r\n");
#line 38 "LogPage.cshtml" #line 39 "LogPage.cshtml"
} }
#line default #line default
@ -140,21 +146,21 @@ WriteTo(__razor_helper_writer, log.Message);
} }
); );
#line 39 "LogPage.cshtml" #line 40 "LogPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
public HelperResult public HelperResult
#line 41 "LogPage.cshtml" #line 42 "LogPage.cshtml"
Traverse(ScopeNode node, int level) Traverse(ScopeNode node, int level, Dictionary<string, int> counts)
{ {
#line default #line default
#line hidden #line hidden
return new HelperResult((__razor_helper_writer) => { return new HelperResult((__razor_helper_writer) => {
#line 42 "LogPage.cshtml" #line 43 "LogPage.cshtml"
// print start of scope // print start of scope
@ -162,7 +168,7 @@ Traverse(ScopeNode node, int level)
#line default #line default
#line hidden #line hidden
#line 44 "LogPage.cshtml" #line 45 "LogPage.cshtml"
WriteTo(__razor_helper_writer, LogRow(new LogInfo() WriteTo(__razor_helper_writer, LogRow(new LogInfo()
{ {
Name = node.Name, Name = node.Name,
@ -173,7 +179,7 @@ WriteTo(__razor_helper_writer, LogRow(new LogInfo()
#line default #line default
#line hidden #line hidden
#line 50 "LogPage.cshtml" #line 51 "LogPage.cshtml"
; ;
var messageIndex = 0; var messageIndex = 0;
var childIndex = 0; var childIndex = 0;
@ -186,13 +192,14 @@ WriteTo(__razor_helper_writer, LogRow(new LogInfo()
#line default #line default
#line hidden #line hidden
#line 57 "LogPage.cshtml" #line 58 "LogPage.cshtml"
WriteTo(__razor_helper_writer, LogRow(node.Messages[messageIndex], level)); WriteTo(__razor_helper_writer, LogRow(node.Messages[messageIndex], level));
#line default #line default
#line hidden #line hidden
#line 57 "LogPage.cshtml" #line 58 "LogPage.cshtml"
counts[node.Messages[messageIndex].Severity.ToString()]++;
messageIndex++; messageIndex++;
} }
else else
@ -202,12 +209,12 @@ WriteTo(__razor_helper_writer, LogRow(node.Messages[messageIndex], level));
#line default #line default
#line hidden #line hidden
#line 62 "LogPage.cshtml" #line 64 "LogPage.cshtml"
WriteTo(__razor_helper_writer, Traverse(node.Children[childIndex], level + 1)); WriteTo(__razor_helper_writer, Traverse(node.Children[childIndex], level + 1, counts));
#line default #line default
#line hidden #line hidden
#line 62 "LogPage.cshtml" #line 64 "LogPage.cshtml"
childIndex++; childIndex++;
} }
@ -221,13 +228,14 @@ WriteTo(__razor_helper_writer, Traverse(node.Children[childIndex], level + 1));
#line default #line default
#line hidden #line hidden
#line 70 "LogPage.cshtml" #line 72 "LogPage.cshtml"
WriteTo(__razor_helper_writer, LogRow(node.Messages[i], level)); WriteTo(__razor_helper_writer, LogRow(node.Messages[i], level));
#line default #line default
#line hidden #line hidden
#line 70 "LogPage.cshtml" #line 72 "LogPage.cshtml"
counts[node.Messages[i].Severity.ToString()]++;
} }
} }
else else
@ -239,12 +247,12 @@ WriteTo(__razor_helper_writer, LogRow(node.Messages[i], level));
#line default #line default
#line hidden #line hidden
#line 77 "LogPage.cshtml" #line 80 "LogPage.cshtml"
WriteTo(__razor_helper_writer, Traverse(node.Children[i], level + 1)); WriteTo(__razor_helper_writer, Traverse(node.Children[i], level + 1, counts));
#line default #line default
#line hidden #line hidden
#line 77 "LogPage.cshtml" #line 80 "LogPage.cshtml"
} }
} }
@ -254,7 +262,7 @@ WriteTo(__razor_helper_writer, Traverse(node.Children[i], level + 1));
#line default #line default
#line hidden #line hidden
#line 81 "LogPage.cshtml" #line 84 "LogPage.cshtml"
WriteTo(__razor_helper_writer, LogRow(new LogInfo() WriteTo(__razor_helper_writer, LogRow(new LogInfo()
{ {
Name = node.Name, Name = node.Name,
@ -265,7 +273,7 @@ WriteTo(__razor_helper_writer, LogRow(new LogInfo()
#line default #line default
#line hidden #line hidden
#line 87 "LogPage.cshtml" #line 90 "LogPage.cshtml"
; ;
#line default #line default
@ -273,13 +281,13 @@ WriteTo(__razor_helper_writer, LogRow(new LogInfo()
} }
); );
#line 88 "LogPage.cshtml" #line 91 "LogPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 10 "LogPage.cshtml" #line 11 "LogPage.cshtml"
public LogPage(LogPageModel model) public LogPage(LogPageModel model)
{ {
@ -307,6 +315,7 @@ WriteTo(__razor_helper_writer, LogRow(new LogInfo()
<head> <head>
<meta charset=""utf-8"" /> <meta charset=""utf-8"" />
<title>ASP.NET Logs</title> <title>ASP.NET Logs</title>
<script src=""//ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.1.min.js""></script>
<style> <style>
body { body {
font-size: .813em; font-size: .813em;
@ -314,7 +323,7 @@ WriteTo(__razor_helper_writer, LogRow(new LogInfo()
margin: 20px; margin: 20px;
} }
col:nth-child(2) { col:nth-child(2n) {
background-color: #FAFAFA; background-color: #FAFAFA;
} }
@ -355,6 +364,13 @@ tr {
line-height: 2em; line-height: 2em;
} }
.collapse {
color: black;
float: right;
font-weight: normal;
width: 1em;
}
.date, .time { .date, .time {
width: 70px; width: 70px;
} }
@ -391,6 +407,15 @@ tr {
width: 80px; width: 80px;
} }
.summary {
color: black;
line-height: 1.8em;
}
.summary>th {
font-weight: normal;
}
.tab { .tab {
margin-left: 30px; margin-left: 30px;
} }
@ -448,13 +473,13 @@ tr:nth-child(2n) {
<form id=""viewOptions"" method=""get""> <form id=""viewOptions"" method=""get"">
<select name=""level""> <select name=""level"">
"); ");
#line 104 "LogPage.cshtml" #line 108 "LogPage.cshtml"
#line default #line default
#line hidden #line hidden
#line 104 "LogPage.cshtml" #line 108 "LogPage.cshtml"
foreach (var severity in Enum.GetValues(typeof(LogLevel))) foreach (var severity in Enum.GetValues(typeof(LogLevel)))
{ {
var severityInt = (int)severity; var severityInt = (int)severity;
@ -465,16 +490,16 @@ tr:nth-child(2n) {
#line hidden #line hidden
WriteLiteral(" <option"); WriteLiteral(" <option");
WriteAttribute("value", Tuple.Create(" value=\"", 3202), Tuple.Create("\"", 3222), WriteAttribute("value", Tuple.Create(" value=\"", 3500), Tuple.Create("\"", 3520),
Tuple.Create(Tuple.Create("", 3210), Tuple.Create<System.Object, System.Int32>(severityInt, 3210), false)); Tuple.Create(Tuple.Create("", 3508), Tuple.Create<System.Object, System.Int32>(severityInt, 3508), false));
WriteLiteral(" selected=\"selected\">"); WriteLiteral(" selected=\"selected\">");
#line 109 "LogPage.cshtml" #line 113 "LogPage.cshtml"
Write(severity); Write(severity);
#line default #line default
#line hidden #line hidden
WriteLiteral("</option>\r\n"); WriteLiteral("</option>\r\n");
#line 110 "LogPage.cshtml" #line 114 "LogPage.cshtml"
} }
else else
{ {
@ -483,16 +508,16 @@ tr:nth-child(2n) {
#line hidden #line hidden
WriteLiteral(" <option"); WriteLiteral(" <option");
WriteAttribute("value", Tuple.Create(" value=\"", 3351), Tuple.Create("\"", 3371), WriteAttribute("value", Tuple.Create(" value=\"", 3649), Tuple.Create("\"", 3669),
Tuple.Create(Tuple.Create("", 3359), Tuple.Create<System.Object, System.Int32>(severityInt, 3359), false)); Tuple.Create(Tuple.Create("", 3657), Tuple.Create<System.Object, System.Int32>(severityInt, 3657), false));
WriteLiteral(">"); WriteLiteral(">");
#line 113 "LogPage.cshtml" #line 117 "LogPage.cshtml"
Write(severity); Write(severity);
#line default #line default
#line hidden #line hidden
WriteLiteral("</option>\r\n"); WriteLiteral("</option>\r\n");
#line 114 "LogPage.cshtml" #line 118 "LogPage.cshtml"
} }
} }
@ -500,8 +525,8 @@ tr:nth-child(2n) {
#line hidden #line hidden
WriteLiteral(" </select>\r\n <input type=\"text\" name=\"name\""); WriteLiteral(" </select>\r\n <input type=\"text\" name=\"name\"");
WriteAttribute("value", Tuple.Create(" value=\"", 3484), Tuple.Create("\"", 3517), WriteAttribute("value", Tuple.Create(" value=\"", 3782), Tuple.Create("\"", 3815),
Tuple.Create(Tuple.Create("", 3492), Tuple.Create<System.Object, System.Int32>(Model.Options.NamePrefix, 3492), false)); Tuple.Create(Tuple.Create("", 3790), Tuple.Create<System.Object, System.Int32>(Model.Options.NamePrefix, 3790), false));
WriteLiteral(@" /> WriteLiteral(@" />
<input type=""submit"" value=""filter"" /> <input type=""submit"" value=""filter"" />
</form> </form>
@ -513,6 +538,7 @@ tr:nth-child(2n) {
<thead id=""requestHeader""> <thead id=""requestHeader"">
<tr> <tr>
<th class=""path"">Path</th> <th class=""path"">Path</th>
<th class=""method"">Method</th>
<th class=""host"">Host</th> <th class=""host"">Host</th>
<th class=""statusCode"">Status Code</th> <th class=""statusCode"">Status Code</th>
<th class=""logs"">Logs</th> <th class=""logs"">Logs</th>
@ -523,15 +549,16 @@ tr:nth-child(2n) {
<col /> <col />
<col /> <col />
<col /> <col />
<col />
</colgroup> </colgroup>
"); ");
#line 139 "LogPage.cshtml" #line 145 "LogPage.cshtml"
#line default #line default
#line hidden #line hidden
#line 139 "LogPage.cshtml" #line 145 "LogPage.cshtml"
foreach (var activity in Model.Activities.Reverse()) foreach (var activity in Model.Activities.Reverse())
{ {
@ -539,13 +566,13 @@ tr:nth-child(2n) {
#line hidden #line hidden
WriteLiteral(" <tbody>\r\n <tr class=\"requestRow\">\r\n"); WriteLiteral(" <tbody>\r\n <tr class=\"requestRow\">\r\n");
#line 143 "LogPage.cshtml" #line 149 "LogPage.cshtml"
#line default #line default
#line hidden #line hidden
#line 143 "LogPage.cshtml" #line 149 "LogPage.cshtml"
if (activity.HttpInfo != null) if (activity.HttpInfo != null)
{ {
@ -555,30 +582,36 @@ tr:nth-child(2n) {
#line hidden #line hidden
WriteLiteral(" <td><a"); WriteLiteral(" <td><a");
WriteAttribute("href", Tuple.Create(" href=\"", 4534), Tuple.Create("\"", 4553), WriteAttribute("href", Tuple.Create(" href=\"", 4901), Tuple.Create("\"", 4920),
Tuple.Create(Tuple.Create("", 4541), Tuple.Create<System.Object, System.Int32>(requestPath, 4541), false)); Tuple.Create(Tuple.Create("", 4908), Tuple.Create<System.Object, System.Int32>(requestPath, 4908), false));
WriteAttribute("title", Tuple.Create(" title=\"", 4554), Tuple.Create("\"", 4585), WriteAttribute("title", Tuple.Create(" title=\"", 4921), Tuple.Create("\"", 4952),
Tuple.Create(Tuple.Create("", 4562), Tuple.Create<System.Object, System.Int32>(activity.HttpInfo.Path, 4562), false)); Tuple.Create(Tuple.Create("", 4929), Tuple.Create<System.Object, System.Int32>(activity.HttpInfo.Path, 4929), false));
WriteLiteral(">"); WriteLiteral(">");
#line 147 "LogPage.cshtml" #line 153 "LogPage.cshtml"
Write(activity.HttpInfo.Path); Write(activity.HttpInfo.Path);
#line default #line default
#line hidden #line hidden
WriteLiteral("</a></td>\r\n <td>"); WriteLiteral("</a></td>\r\n <td>");
#line 148 "LogPage.cshtml" #line 154 "LogPage.cshtml"
Write(activity.HttpInfo.Method);
#line default
#line hidden
WriteLiteral("</td>\r\n <td>");
#line 155 "LogPage.cshtml"
Write(activity.HttpInfo.Host); Write(activity.HttpInfo.Host);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n <td>"); WriteLiteral("</td>\r\n <td>");
#line 149 "LogPage.cshtml" #line 156 "LogPage.cshtml"
Write(activity.HttpInfo.StatusCode); Write(activity.HttpInfo.StatusCode);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n"); WriteLiteral("</td>\r\n");
#line 150 "LogPage.cshtml" #line 157 "LogPage.cshtml"
} }
else else
{ {
@ -586,14 +619,14 @@ tr:nth-child(2n) {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <td colspan=\"3\">"); WriteLiteral(" <td colspan=\"4\">");
#line 153 "LogPage.cshtml" #line 160 "LogPage.cshtml"
Write(activity.Root.State); Write(activity.Root.State);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n"); WriteLiteral("</td>\r\n");
#line 154 "LogPage.cshtml" #line 161 "LogPage.cshtml"
} }
@ -604,39 +637,60 @@ tr:nth-child(2n) {
<td class=""logTd""> <td class=""logTd"">
<table class=""logTable""> <table class=""logTable"">
<thead class=""logHeader""> <thead class=""logHeader"">
<tr> <tr class=""headerRow"">
<th class=""date"">Date</th> <th class=""date"">Date</th>
<th class=""time"">Time</th> <th class=""time"">Time</th>
<th class=""name"">Name</th> <th class=""name"">Name</th>
<th class=""severity"">Severity</th> <th class=""severity"">Severity</th>
<th class=""state"">State</th> <th class=""state"">State</th>
<th>Error</th> <th>Error<span class=""collapse"">^</span></th>
</tr> </tr>
</thead> </thead>
<tbody>
"); ");
#line 169 "LogPage.cshtml" #line 175 "LogPage.cshtml"
#line default #line default
#line hidden #line hidden
#line 169 "LogPage.cshtml" #line 175 "LogPage.cshtml"
var counts = new Dictionary<string, int>();
counts["Critical"] = 0;
counts["Error"] = 0;
counts["Warning"] = 0;
counts["Information"] = 0;
counts["Verbose"] = 0;
#line default
#line hidden
WriteLiteral("\r\n <tbody class=\"logBody\">\r\n");
#line 184 "LogPage.cshtml"
#line default
#line hidden
#line 184 "LogPage.cshtml"
if (activity.Id.Equals(Guid.Empty)) if (activity.Id.Equals(Guid.Empty))
{ {
// message not within a scope // message not within a scope
var logInfo = activity.Root.Messages.FirstOrDefault();
#line default #line default
#line hidden #line hidden
#line 172 "LogPage.cshtml" #line 188 "LogPage.cshtml"
Write(LogRow(activity.Root.Messages.FirstOrDefault(), 0)); Write(LogRow(logInfo, 0));
#line default #line default
#line hidden #line hidden
#line 172 "LogPage.cshtml" #line 188 "LogPage.cshtml"
counts[logInfo.Severity.ToString()] = 1;
} }
else else
{ {
@ -645,27 +699,110 @@ tr:nth-child(2n) {
#line default #line default
#line hidden #line hidden
#line 176 "LogPage.cshtml" #line 193 "LogPage.cshtml"
Write(Traverse(activity.Root, 0)); Write(Traverse(activity.Root, 0, counts));
#line default #line default
#line hidden #line hidden
#line 176 "LogPage.cshtml" #line 193 "LogPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </tbody>\r\n </table>\r\n " + WriteLiteral(" </tbody>\r\n <tbody class=\"s" +
" </td>\r\n </tr>\r\n </tbody>\r\n"); "ummary\">\r\n <tr class=\"logRow\">\r\n " +
#line 183 "LogPage.cshtml" " <td>");
#line 198 "LogPage.cshtml"
Write(activity.Time.ToString("MM-dd-yyyy HH:mm:ss"));
#line default
#line hidden
WriteLiteral("</td>\r\n");
#line 199 "LogPage.cshtml"
#line default
#line hidden
#line 199 "LogPage.cshtml"
foreach (var kvp in counts)
{
if (string.Equals("Verbose", kvp.Key)) {
#line default
#line hidden
WriteLiteral(" <td>");
#line 202 "LogPage.cshtml"
Write(kvp.Value);
#line default
#line hidden
WriteLiteral(" ");
#line 202 "LogPage.cshtml"
Write(kvp.Key);
#line default
#line hidden
WriteLiteral("<span class=\"collapse\">v</span></td>\r\n");
#line 203 "LogPage.cshtml"
}
else
{
#line default
#line hidden
WriteLiteral(" <td>");
#line 206 "LogPage.cshtml"
Write(kvp.Value);
#line default
#line hidden
WriteLiteral(" ");
#line 206 "LogPage.cshtml"
Write(kvp.Key);
#line default
#line hidden
WriteLiteral("</td>\r\n");
#line 207 "LogPage.cshtml"
}
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n </tbody>\r\n " +
" </table>\r\n </td>\r\n </tr>\r\n" +
" </tbody>\r\n");
#line 215 "LogPage.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </table>\r\n</body>\r\n</html>"); WriteLiteral(@" </table>
<script type=""text/javascript"">
$(document).ready(function () {
$("".logBody"").hide();
$("".logTable > thead"").hide();
$("".logTable > thead"").click(function () {
$(this).closest("".logTable"").find(""tbody"").hide();
$(this).closest("".logTable"").find("".summary"").show();
$(this).hide();
});
$("".logTable > .summary"").click(function () {
$(this).closest("".logTable"").find(""tbody"").show();
$(this).closest("".logTable"").find(""thead"").show();
$(this).hide();
});
});
</script>
</body>
</html>");
} }
#pragma warning restore 1998 #pragma warning restore 1998
} }

66
src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cshtml
View File

@ -1,4 +1,5 @@
@using System @using System
@using System.Collections.Generic
@using System.Globalization @using System.Globalization
@using System.Linq @using System.Linq
@using Microsoft.AspNet.Diagnostics.Elm.Views @using Microsoft.AspNet.Diagnostics.Elm.Views
@ -38,7 +39,7 @@
} }
} }
@helper Traverse(ScopeNode node, int level) @helper Traverse(ScopeNode node, int level, Dictionary<string, int> counts)
{ {
// print start of scope // print start of scope
@LogRow(new LogInfo() @LogRow(new LogInfo()
@ -55,11 +56,12 @@
if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime) if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
{ {
@LogRow(node.Messages[messageIndex], level) @LogRow(node.Messages[messageIndex], level)
counts[node.Messages[messageIndex].Severity.ToString()]++;
messageIndex++; messageIndex++;
} }
else else
{ {
@Traverse(node.Children[childIndex], level + 1) @Traverse(node.Children[childIndex], level + 1, counts)
childIndex++; childIndex++;
} }
} }
@ -68,13 +70,14 @@
for (var i = messageIndex; i < node.Messages.Count; i++) for (var i = messageIndex; i < node.Messages.Count; i++)
{ {
@LogRow(node.Messages[i], level) @LogRow(node.Messages[i], level)
counts[node.Messages[i].Severity.ToString()]++;
} }
} }
else else
{ {
for (var i = childIndex; i < node.Children.Count; i++) for (var i = childIndex; i < node.Children.Count; i++)
{ {
@Traverse(node.Children[i], level + 1) @Traverse(node.Children[i], level + 1, counts)
} }
} }
// print end of scope // print end of scope
@ -92,6 +95,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ASP.NET Logs</title> <title>ASP.NET Logs</title>
<script src="//ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.1.min.js"></script>
<style> <style>
<%$ include: LogPage.css %> <%$ include: LogPage.css %>
<%$ include: Shared.css %> <%$ include: Shared.css %>
@ -125,6 +129,7 @@
<thead id="requestHeader"> <thead id="requestHeader">
<tr> <tr>
<th class="path">Path</th> <th class="path">Path</th>
<th class="method">Method</th>
<th class="host">Host</th> <th class="host">Host</th>
<th class="statusCode">Status Code</th> <th class="statusCode">Status Code</th>
<th class="logs">Logs</th> <th class="logs">Logs</th>
@ -135,6 +140,7 @@
<col /> <col />
<col /> <col />
<col /> <col />
<col />
</colgroup> </colgroup>
@foreach (var activity in Model.Activities.Reverse()) @foreach (var activity in Model.Activities.Reverse())
{ {
@ -145,42 +151,84 @@
{ {
var requestPath = Model.Path.Value + "/" + activity.HttpInfo.RequestID; var requestPath = Model.Path.Value + "/" + activity.HttpInfo.RequestID;
<td><a href="@requestPath" title="@activity.HttpInfo.Path">@activity.HttpInfo.Path</a></td> <td><a href="@requestPath" title="@activity.HttpInfo.Path">@activity.HttpInfo.Path</a></td>
<td>@activity.HttpInfo.Method</td>
<td>@activity.HttpInfo.Host</td> <td>@activity.HttpInfo.Host</td>
<td>@activity.HttpInfo.StatusCode</td> <td>@activity.HttpInfo.StatusCode</td>
} }
else else
{ {
<td colspan="3">@activity.Root.State</td> <td colspan="4">@activity.Root.State</td>
} }
} }
<td class="logTd"> <td class="logTd">
<table class="logTable"> <table class="logTable">
<thead class="logHeader"> <thead class="logHeader">
<tr> <tr class="headerRow">
<th class="date">Date</th> <th class="date">Date</th>
<th class="time">Time</th> <th class="time">Time</th>
<th class="name">Name</th> <th class="name">Name</th>
<th class="severity">Severity</th> <th class="severity">Severity</th>
<th class="state">State</th> <th class="state">State</th>
<th>Error</th> <th>Error<span class="collapse">^</span></th>
</tr> </tr>
</thead> </thead>
<tbody> @{
var counts = new Dictionary<string, int>();
counts["Critical"] = 0;
counts["Error"] = 0;
counts["Warning"] = 0;
counts["Information"] = 0;
counts["Verbose"] = 0;
}
<tbody class="logBody">
@if (activity.Id.Equals(Guid.Empty)) @if (activity.Id.Equals(Guid.Empty))
{ {
// message not within a scope // message not within a scope
@LogRow(activity.Root.Messages.FirstOrDefault(), 0) var logInfo = activity.Root.Messages.FirstOrDefault();
@LogRow(logInfo, 0)
counts[logInfo.Severity.ToString()] = 1;
} }
else else
{ {
@Traverse(activity.Root, 0) @Traverse(activity.Root, 0, counts)
} }
</tbody> </tbody>
<tbody class="summary">
<tr class="logRow">
<td>@activity.Time.ToString("MM-dd-yyyy HH:mm:ss")</td>
@foreach (var kvp in counts)
{
if (string.Equals("Verbose", kvp.Key)) {
<td>@kvp.Value @kvp.Key<span class="collapse">v</span></td>
}
else
{
<td>@kvp.Value @kvp.Key</td>
}
}
</tr>
</tbody>
</table> </table>
</td> </td>
</tr> </tr>
</tbody> </tbody>
} }
</table> </table>
<script type="text/javascript">
$(document).ready(function () {
$(".logBody").hide();
$(".logTable > thead").hide();
$(".logTable > thead").click(function () {
$(this).closest(".logTable").find("tbody").hide();
$(this).closest(".logTable").find(".summary").show();
$(this).hide();
});
$(".logTable > .summary").click(function () {
$(this).closest(".logTable").find("tbody").show();
$(this).closest(".logTable").find("thead").show();
$(this).hide();
});
});
</script>
</body> </body>
</html> </html>

18
src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.css
View File

@ -4,7 +4,7 @@
margin: 20px; margin: 20px;
} }
col:nth-child(2) { col:nth-child(2n) {
background-color: #FAFAFA; background-color: #FAFAFA;
} }
@ -45,6 +45,13 @@ tr {
line-height: 2em; line-height: 2em;
} }
.collapse {
color: black;
float: right;
font-weight: normal;
width: 1em;
}
.date, .time { .date, .time {
width: 70px; width: 70px;
} }
@ -81,6 +88,15 @@ tr {
width: 80px; width: 80px;
} }
.summary {
color: black;
line-height: 1.8em;
}
.summary>th {
font-weight: normal;
}
.tab { .tab {
margin-left: 30px; margin-left: 30px;
} }