Skip to content

Commit 680141e

Browse files
committed
Catch and Log errors when completing ServiceStack Request
1 parent 87951d4 commit 680141e

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

src/ServiceStack/ServiceStackHost.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -595,17 +595,24 @@ public virtual void Release(object instance)
595595

596596
public virtual void OnEndRequest(IRequest request = null)
597597
{
598-
var disposables = RequestContext.Instance.Items.Values;
599-
foreach (var item in disposables)
598+
try
600599
{
601-
Release(item);
602-
}
600+
var disposables = RequestContext.Instance.Items.Values;
601+
foreach (var item in disposables)
602+
{
603+
Release(item);
604+
}
603605

604-
RequestContext.Instance.EndRequest();
606+
RequestContext.Instance.EndRequest();
605607

606-
foreach (var fn in OnEndRequestCallbacks)
608+
foreach (var fn in OnEndRequestCallbacks)
609+
{
610+
fn(request);
611+
}
612+
}
613+
catch (Exception ex)
607614
{
608-
fn(request);
615+
Log.Error("Error when Disposing Request Context", ex);
609616
}
610617
}
611618

0 commit comments

Comments
 (0)