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

ircd::server: Use interface function to query canceled.

Browse source
This commit is contained in:
Jason Volk 2019-09-11 17:55:22 -07:00
parent b09c0a464a
commit ba3d82abe7
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ircd/server.cc
View file

@ -427,7 +427,7 @@ try
if(empty(request.out.head)) if(empty(request.out.head))
return "<no head>"; return "<no head>";
if(request.tag && request.tag->cancellation) if(request.tag && request.tag->canceled())
return "<canceled; out data is gone>"; return "<canceled; out data is gone>";
const http::request::head head const http::request::head head
@ -476,7 +476,7 @@ try
if(empty(request.in.head)) if(empty(request.in.head))
return {}; return {};
if(request.tag && request.tag->cancellation) if(request.tag && request.tag->canceled())
return {}; return {};
parse::buffer pb{request.in.head}; parse::buffer pb{request.in.head};
@ -509,7 +509,7 @@ try
if(empty(request.out.head)) if(empty(request.out.head))
return {}; return {};
if(request.tag && request.tag->cancellation) if(request.tag && request.tag->canceled())
return {}; return {};
parse::buffer pb{request.out.head}; parse::buffer pb{request.out.head};

8
modules/console.cc
View file

@ -5003,21 +5003,29 @@ try
if(request.tag) if(request.tag)
out << std::setw(4) << uint(request.tag->state.status) << " "; out << std::setw(4) << uint(request.tag->state.status) << " ";
else if(!request.tag)
out << std::setw(4) << "----" << " ";
else else
out << std::setw(4) << "CNCL" << " "; out << std::setw(4) << "CNCL" << " ";
if(request.tag && request.tag->committed()) if(request.tag && request.tag->committed())
out << std::setw(4) << "PIPE" << " "; out << std::setw(4) << "PIPE" << " ";
else if(!request.tag)
out << std::setw(4) << "----" << " ";
else else
out << std::setw(4) << " " << " "; out << std::setw(4) << " " << " ";
if(request.tag && request.tag->abandoned()) if(request.tag && request.tag->abandoned())
out << std::setw(4) << "LEFT" << " "; out << std::setw(4) << "LEFT" << " ";
else if(!request.tag)
out << std::setw(4) << "----" << " ";
else else
out << std::setw(4) << " " << " "; out << std::setw(4) << " " << " ";
if(request.tag && request.tag->canceled()) if(request.tag && request.tag->canceled())
out << std::setw(4) << "CNCL" << " "; out << std::setw(4) << "CNCL" << " ";
else if(!request.tag)
out << std::setw(4) << "----" << " ";
else else
out << std::setw(4) << " " << " "; out << std::setw(4) << " " << " ";