MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 18:22:50 +01:00
Code Issues Releases Wiki Activity

ircd::client: Improve exception handling to cover URI's of internal server errors out of handlers.

Browse source
This commit is contained in:
Jason Volk 2019-03-01 13:31:43 -08:00
parent e763e7e9a8
commit 4612fc6058
1 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
ircd/client.cc
View file

@ -780,6 +780,10 @@ try
return ret; return ret;
} }
catch(const ctx::interrupted &e)
{
throw;
}
catch(const std::system_error &e) catch(const std::system_error &e)
{ {
static const auto operation_canceled static const auto operation_canceled
@ -801,22 +805,24 @@ catch(const std::system_error &e)
return false; return false;
} }
catch(const std::exception &e) catch(const http::error &e)
{ {
log::derror
{
resource::log, "%s HTTP 400 BAD REQUEST :%u %s :%s",
loghead(),
uint(e.code),
http::status(e.code),
e.content
};
if(!sock || sock->fini) if(!sock || sock->fini)
return false; return false;
log::error
{
log, "%s HTTP 500 Internal Error: %s",
loghead(),
e.what()
};
const ctx::exception_handler eh; const ctx::exception_handler eh;
resource::response resource::response
{ {
*this, e.what(), "text/html; charset=utf-8", http::INTERNAL_SERVER_ERROR *this, e.content, "text/html; charset=utf-8", http::BAD_REQUEST, e.headers
}; };
return false; return false;
@ -847,6 +853,14 @@ try
discard_unconsumed(head); discard_unconsumed(head);
return true; return true;
} }
catch(const ctx::interrupted &)
{
throw;
}
catch(const std::system_error &)
{
throw;
}
catch(const http::error &e) catch(const http::error &e)
{ {
const ctx::exception_handler eh; const ctx::exception_handler eh;
@ -883,6 +897,25 @@ catch(const http::error &e)
return true; return true;
} }
} }
catch(const std::exception &e)
{
const ctx::exception_handler eh;
log::error
{
log, "%s HTTP 500 Internal Error `%s' :%s",
loghead(),
head.uri,
e.what()
};
resource::response
{
*this, e.what(), "text/html; charset=utf-8", http::INTERNAL_SERVER_ERROR
};
return false;
}
void void
ircd::client::discard_unconsumed(const http::request::head &head) ircd::client::discard_unconsumed(const http::request::head &head)