zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now considering Response.End() in formatters execution so no error message is displayed in the log.

Browse source
This commit is contained in:
Dario Solera 2010-06-03 10:31:24 +00:00
parent 44311ba307
commit 6195533a07
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.2.541")] [assembly: AssemblyVersion("3.0.2.542")]
[assembly: AssemblyFileVersion("3.0.2.541")] [assembly: AssemblyFileVersion("3.0.2.542")]

13
Core/FormattingPipeline.cs
View file

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using ScrewTurn.Wiki.PluginFramework; using ScrewTurn.Wiki.PluginFramework;
using System.Web; using System.Web;
using System.Threading;
namespace ScrewTurn.Wiki { namespace ScrewTurn.Wiki {
@ -65,7 +66,9 @@ namespace ScrewTurn.Wiki {
raw = provider.Format(raw, info, FormattingPhase.Phase1); raw = provider.Format(raw, info, FormattingPhase.Phase1);
} }
catch(Exception ex) { catch(Exception ex) {
Log.LogEntry("Provider " + provider.Information.Name + " failed to perform Phase1 (silently resuming from next provider): " + ex.ToString(), EntryType.Error, Log.SystemUsername); if(!(ex is ThreadAbortException)) { // Consider Response.End()
Log.LogEntry("Provider " + provider.Information.Name + " failed to perform Phase1 (silently resuming from next provider): " + ex.ToString(), EntryType.Error, Log.SystemUsername);
}
} }
} }
} }
@ -79,7 +82,9 @@ namespace ScrewTurn.Wiki {
raw = provider.Format(raw, info, FormattingPhase.Phase2); raw = provider.Format(raw, info, FormattingPhase.Phase2);
} }
catch(Exception ex) { catch(Exception ex) {
Log.LogEntry("Provider " + provider.Information.Name + " failed to perform Phase2 (silently resuming from next provider): " + ex.ToString(), EntryType.Error, Log.SystemUsername); if(!(ex is ThreadAbortException)) { // Consider Response.End()
Log.LogEntry("Provider " + provider.Information.Name + " failed to perform Phase2 (silently resuming from next provider): " + ex.ToString(), EntryType.Error, Log.SystemUsername);
}
} }
} }
} }
@ -109,7 +114,9 @@ namespace ScrewTurn.Wiki {
raw = provider.Format(raw, info, FormattingPhase.Phase3); raw = provider.Format(raw, info, FormattingPhase.Phase3);
} }
catch(Exception ex) { catch(Exception ex) {
Log.LogEntry("Provider " + provider.Information.Name + " failed to perform Phase3 (silently resuming from next provider): " + ex.ToString(), EntryType.Error, Log.SystemUsername); if(!(ex is ThreadAbortException)) { // Consider Response.End()
Log.LogEntry("Provider " + provider.Information.Name + " failed to perform Phase3 (silently resuming from next provider): " + ex.ToString(), EntryType.Error, Log.SystemUsername);
}
} }
} }
} }