tomasz.sowa
/
winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

fix: correctly clear after a request when an exception has been thrown

This commit is contained in:
Tomasz Sowa 2023-05-16 15:31:13 +02:00
parent dda325bbbf
commit 1655ae3562
Signed by: tomasz.sowa
GPG Key ID: 662CC1438638588B
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
winixd/core/app.cpp
View File

@ -766,25 +766,12 @@ void App::ProcessRequestThrow()
void App::ProcessRequest() void App::ProcessRequest()
{ {
try
{
system.load_avg.StartRequest(cur.request); system.load_avg.StartRequest(cur.request);
log << log2 << config.log_delimiter << logend; log << log2 << config.log_delimiter << logend;
try
{
ProcessRequestThrow(); ProcessRequestThrow();
if( cur.request->run_state == Request::RunState::normal_run )
{
cur.request->FinishRequest();
system.load_avg.StopRequest(cur.request);
}
SaveSessionsIfNeeded();
if( cur.request->run_state == Request::RunState::finished )
{
ClearAfterRequest();
}
} }
catch(const std::exception & e) catch(const std::exception & e)
{ {
@ -798,13 +785,38 @@ void App::ProcessRequest()
{ {
log << log1 << "App: there was an unknown exception" << logend; log << log1 << "App: there was an unknown exception" << logend;
} }
try
{
if( cur.request->run_state == Request::RunState::normal_run )
{
cur.request->FinishRequest();
system.load_avg.StopRequest(cur.request);
}
SaveSessionsIfNeeded();
}
catch(...)
{
log << log1 << "App: an exception when finishing a request" << logend;
}
try
{
if( cur.request->run_state == Request::RunState::finished )
{
ClearAfterRequest();
}
}
catch(...)
{
log << log1 << "App: an exception when clearing after a request" << logend;
}
} }
void App::ClearAfterRequest() void App::ClearAfterRequest()
{ {
try
{
// simple operations which should not throw an exception // simple operations which should not throw an exception
cur.request->Clear(); cur.request->Clear();
cur.session->ClearAfterRequest(); cur.session->ClearAfterRequest();
@ -818,11 +830,6 @@ void App::ClearAfterRequest()
model_connector.set_winix_session_logger(nullptr); model_connector.set_winix_session_logger(nullptr);
log << logendrequest; log << logendrequest;
}
catch(...)
{
log << log1 << "App: an exception when clearing after a request" << logend;
}
} }