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

Use Microsoft.Extensions.StackTrace.Sources

This commit is contained in:
Pranav K 2016-06-02 22:45:18 -07:00
parent a3b2a7b62b
commit d02f67785f
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
View File

@ -8,12 +8,12 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.ExceptionServices;
using System.Text;
using System.Text.Encodings.Web;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.Extensions.StackTrace.Sources;
namespace Microsoft.AspNetCore.Hosting
{
@ -54,12 +54,12 @@ namespace Microsoft.AspNetCore.Hosting
return Encoding.UTF8.GetBytes(string.Format(CultureInfo.InvariantCulture, _errorPageFormatString, builder, rawExceptionDetails, footer));
}
private static string BuildCodeSnippetDiv(StackFrame frame)
private static string BuildCodeSnippetDiv(StackFrameInfo frameInfo)
{
var filename = frame.GetFileName();
var filename = frameInfo.FilePath;
if (!string.IsNullOrEmpty(filename))
{
int failingLineNumber = frame.GetFileLineNumber();
int failingLineNumber = frameInfo.LineNumber;
if (failingLineNumber >= 1)
{
var lines = GetFailingCallSiteInFile(filename, failingLineNumber);
@ -76,10 +76,11 @@ namespace Microsoft.AspNetCore.Hosting
return null;
}
private static string BuildLineForStackFrame(StackFrame frame)
private static string BuildLineForStackFrame(StackFrameInfo frameInfo)
{
var builder = new StringBuilder("<pre>");
var method = frame.GetMethod();
var stackFrame = frameInfo.StackFrame;
var method = stackFrame.GetMethod();
// Special case: no method available
if (method == null)
@ -116,12 +117,12 @@ namespace Microsoft.AspNetCore.Hosting
builder.AppendFormat(CultureInfo.InvariantCulture, @"<span class=""faded"">{0}</span>", HtmlEncodeAndReplaceLineBreaks(BuildMethodParametersUnescaped(method)));
// Do we have source information for this frame?
if (frame.GetILOffset() != -1)
if (stackFrame.GetILOffset() != -1)
{
var filename = frame.GetFileName();
var filename = frameInfo.FilePath;
if (!string.IsNullOrEmpty(filename))
{
builder.AppendFormat(CultureInfo.InvariantCulture, " in {0}:line {1:D}", HtmlEncodeAndReplaceLineBreaks(filename), frame.GetFileLineNumber());
builder.AppendFormat(CultureInfo.InvariantCulture, " in {0}:line {1:D}", HtmlEncodeAndReplaceLineBreaks(filename), frameInfo.LineNumber);
}
}
@ -235,7 +236,7 @@ namespace Microsoft.AspNetCore.Hosting
var environment = PlatformServices.Default.Runtime;
var runtimeType = HtmlEncodeAndReplaceLineBreaks(environment.RuntimeType);
var runtimeDisplayName = runtimeType == "CoreCLR" ? ".NET Core" : runtimeType == "CLR" ? ".NET Framework" : "Mono";
#if NETCOREAPP1_0 || NETSTANDARD1_3
#if NETSTANDARD1_5
var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly;
var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString();
var clrVersion = HtmlEncodeAndReplaceLineBreaks(assemblyVersion);
@ -276,21 +277,20 @@ namespace Microsoft.AspNetCore.Hosting
// First, build the stack trace
var firstStackFrame = true;
var stackTraceBuilder = new StringBuilder();
var needFileInfo = true;
foreach (var frame in new StackTrace(ex, needFileInfo).GetFrames() ?? Enumerable.Empty<StackFrame>())
foreach (var frameInfo in StackTraceHelper.GetFrames(ex))
{
if (!firstStackFrame)
{
stackTraceBuilder.Append("<br />");
}
firstStackFrame = false;
var thisFrameLine = BuildLineForStackFrame(frame);
var thisFrameLine = BuildLineForStackFrame(frameInfo);
stackTraceBuilder.AppendLine(thisFrameLine);
// Try to include the source code in the error page if we can.
if (!wasFailingCallSiteSourceWritten && inlineSourceDiv == null)
{
inlineSourceDiv = BuildCodeSnippetDiv(frame);
inlineSourceDiv = BuildCodeSnippetDiv(frameInfo);
if (inlineSourceDiv != null)
{
wasFailingCallSiteSourceWritten = true;

9
src/Microsoft.AspNetCore.Hosting/project.json
View File

@ -30,11 +30,16 @@
"Microsoft.Extensions.DependencyInjection": "1.0.0-*",
"Microsoft.Extensions.Logging": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
"Microsoft.Extensions.StackTrace.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.TypeNameHelper.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"System.Diagnostics.DiagnosticSource": "4.0.0-*"
"System.Diagnostics.DiagnosticSource": "4.0.0-*",
"System.Reflection.Metadata": "1.3.0-*"
},
"frameworks": {
"net451": {
@ -50,7 +55,7 @@
}
}
},
"netstandard1.3": {
"netstandard1.5": {
"dependencies": {
"System.Console": "4.0.0-*",
"System.Diagnostics.StackTrace": "4.0.1-*",

2
src/Microsoft.AspNetCore.TestHost/project.json
View File

@ -29,7 +29,7 @@
"System.Net.Http": ""
}
},
"netstandard1.3": {
"netstandard1.5": {
"dependencies": {
"System.Diagnostics.Contracts": "4.0.1-*",
"System.Net.Http": "4.1.0-*"