Skip to content
This repository was archived by the owner on Oct 2, 2024. It is now read-only.

Commit 2d2dcd9

Browse files
author
Twan Jacobs
committed
Use IExceptionFilter instead of HandleErrorAttribute
Revert package updates
1 parent 004302a commit 2d2dcd9

8 files changed

+55
-60
lines changed

‎src/SerilogWeb.Classic.Mvc/Classic/Mvc/PreApplicationStartModule.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class PreApplicationStartModule
77
public static void Register()
88
{
99
GlobalFilters.Filters.Add(new StoreMvcInfoInHttpContextActionFilter());
10-
GlobalFilters.Filters.Add(new SerilogWebClassicHandleErrorAttribute());
10+
GlobalFilters.Filters.Add(new SerilogWebClassicExceptionFilter());
1111
}
1212
}
1313
}

‎src/SerilogWeb.Classic.Mvc/Classic/Mvc/SerilogWebClassicExceptionFilter.cs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Web.Mvc;
3+
using SerilogWeb.Classic.Extensions;
4+
5+
namespace SerilogWeb.Classic.Mvc
6+
{
7+
internal class SerilogWebClassicExceptionFilter : IExceptionFilter
8+
{
9+
public void OnException(ExceptionContext filterContext)
10+
{
11+
if (filterContext.ExceptionHandled || filterContext.HttpContext.IsCustomErrorEnabled)
12+
{
13+
var exception = filterContext.Exception;
14+
if (exception != null)
15+
{
16+
filterContext.HttpContext.AddSerilogWebError(exception);
17+
}
18+
}
19+
}
20+
}
21+
}

‎src/SerilogWeb.Classic.Mvc/Classic/Mvc/SerilogWebClassicHandleErrorAttribute.cs

-26
This file was deleted.

‎src/SerilogWeb.Classic.Mvc/SerilogWeb.Classic.Mvc.csproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\Serilog.2.9.0\lib\net45\Serilog.dll</HintPath>
44+
<HintPath>..\..\packages\Serilog.2.7.1\lib\net45\Serilog.dll</HintPath>
4545
</Reference>
4646
<Reference Include="SerilogWeb.Classic, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9462ddd55fbc0e7f, processorArchitecture=MSIL">
4747
<HintPath>..\..\packages\SerilogWeb.Classic.5.0.52\lib\net45\SerilogWeb.Classic.dll</HintPath>
@@ -50,22 +50,22 @@
5050
<Reference Include="System.Core" />
5151
<Reference Include="System.Web" />
5252
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
53+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
5454
</Reference>
55-
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
55+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
5757
</Reference>
5858
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
59+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
6060
</Reference>
6161
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
62+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
65+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
6666
</Reference>
6767
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
68+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
6969
</Reference>
7070
<Reference Include="System.Xml.Linq" />
7171
<Reference Include="System.Data.DataSetExtensions" />
@@ -85,7 +85,7 @@
8585
<Compile Include="Classic\Mvc\Enrichers\MvcRouteDataEnricher.cs" />
8686
<Compile Include="Classic\Mvc\Enrichers\MvcRouteTemplateEnricher.cs" />
8787
<Compile Include="Classic\Mvc\PreApplicationStartModule.cs" />
88-
<Compile Include="Classic\Mvc\SerilogWebClassicHandleErrorAttribute.cs" />
88+
<Compile Include="Classic\Mvc\SerilogWebClassicExceptionFilter.cs" />
8989
<Compile Include="Classic\Mvc\StoreMvcInfoInHttpContextActionFilter.cs" />
9090
<Compile Include="Classic\Mvc\MvcRequestInfoKey.cs" />
9191
<Compile Include="Properties\AssemblyInfo.cs" />

‎src/SerilogWeb.Classic.Mvc/packages.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
66
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
7-
<package id="Serilog" version="2.9.0" targetFramework="net45" />
7+
<package id="Serilog" version="2.7.1" targetFramework="net45" />
88
<package id="SerilogWeb.Classic" version="5.0.52" targetFramework="net45" />
99
</packages>

‎test/SerilogWeb.Classic.Mvc.Test/SerilogWeb.Classic.Mvc.Test.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Serilog.2.9.0\lib\net45\Serilog.dll</HintPath>
64+
<HintPath>..\..\packages\Serilog.2.7.1\lib\net45\Serilog.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
6767
<HintPath>..\..\packages\Serilog.Settings.AppSettings.2.1.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
@@ -85,26 +85,26 @@
8585
<Reference Include="System.Web" />
8686
<Reference Include="System.Web.Abstractions" />
8787
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
88+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
8989
</Reference>
90-
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
90+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
9292
</Reference>
9393
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9494
<HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
9595
</Reference>
9696
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
97+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
9898
</Reference>
9999
<Reference Include="System.Web.Routing" />
100100
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
101+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
102102
</Reference>
103103
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
104-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
104+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
105105
</Reference>
106106
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
107+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
108108
</Reference>
109109
<Reference Include="System.Xml" />
110110
<Reference Include="System.Configuration" />

‎test/SerilogWeb.Classic.Mvc.Test/Web.config

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212

1313
<add key="serilog:minimum-level" value="Debug" />
1414
<add key="serilog:using:Trace" value="Serilog.Sinks.Trace" />
15-
<add key="serilog:write-to:Trace" />
16-
<add key="serilog:write-to:Trace.outputTemplate" value="{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception} {Properties:j}" />
15+
<add key="serilog:write-to:Trace"/>
16+
<add key="serilog:write-to:Trace.outputTemplate" value="{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception} {Properties:j}"/>
1717

18-
<add key="serilog:using:SerilogWeb.Classic.Mvc" value="SerilogWeb.Classic.Mvc" />
19-
<add key="serilog:enrich:WithMvcActionName.propertyName" value="MvcActionNameTest" />
20-
<add key="serilog:enrich:WithMvcControllerName.propertyName" value="MvcControllerNameTest" />
21-
<add key="serilog:enrich:WithMvcRouteData.propertyName" value="MvcRouteDataTest" />
22-
<add key="serilog:enrich:WithMvcRouteTemplate.propertyName" value="MvcRouteTemplateTest" />
18+
<add key="serilog:using:SerilogWeb.Classic.Mvc" value="SerilogWeb.Classic.Mvc"/>
19+
<add key="serilog:enrich:WithMvcActionName.propertyName" value="MvcActionNameTest"/>
20+
<add key="serilog:enrich:WithMvcControllerName.propertyName" value="MvcControllerNameTest"/>
21+
<add key="serilog:enrich:WithMvcRouteData.propertyName" value="MvcRouteDataTest"/>
22+
<add key="serilog:enrich:WithMvcRouteTemplate.propertyName" value="MvcRouteTemplateTest"/>
2323
</appSettings>
2424
<!--
2525
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -59,7 +59,7 @@
5959
</dependentAssembly>
6060
<dependentAssembly>
6161
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
62-
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
62+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
6363
</dependentAssembly>
6464
</assemblyBinding>
6565
</runtime>

‎test/SerilogWeb.Classic.Mvc.Test/packages.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
55
<package id="jQuery" version="1.10.2" targetFramework="net45" />
66
<package id="jQuery.Validation" version="1.11.1" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
8+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
99
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
10-
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
10+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1111
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.5" targetFramework="net45" />
1212
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net45" />
1313
<package id="Microsoft.Net.Compilers" version="2.1.0" targetFramework="net45" developmentDependency="true" />
1414
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1515
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
1616
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1717
<package id="Respond" version="1.2.0" targetFramework="net45" />
18-
<package id="Serilog" version="2.9.0" targetFramework="net45" />
18+
<package id="Serilog" version="2.7.1" targetFramework="net45" />
1919
<package id="Serilog.Settings.AppSettings" version="2.1.2" targetFramework="net45" />
2020
<package id="Serilog.Sinks.Trace" version="2.1.0" targetFramework="net45" />
2121
<package id="SerilogWeb.Classic" version="5.0.52" targetFramework="net45" />

0 commit comments

Comments
 (0)