MirrorHub
/
construct
mirror of https://github.com/matrix-construct/construct
0
0
Fork 0
Code Issues Releases Wiki Activity

ircd::server: Add bounds for wait all w/ conf items; promote warning; rename item.

This commit is contained in:
Jason Volk 2023-03-21 10:28:25 -07:00
parent 1b8ad3e160
commit bffa445d37
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ircd/server.cc
View File

@ -14,6 +14,8 @@ namespace ircd::server
extern log::log log;
extern ctx::dock dock;
extern conf::item<seconds> close_all_timeout;
extern conf::item<seconds> wait_all_timeout;
extern conf::item<size_t> wait_all_max;
extern peers_allocator_state peers_alloc;
// Internal util
@ -59,10 +61,24 @@ ircd::server::enable
decltype(ircd::server::close_all_timeout)
ircd::server::close_all_timeout
{
{ "name", "ircd.server.close_all_timeout" },
{ "name", "ircd.server.close_all.timeout" },
{ "default", 2L },
};
decltype(ircd::server::wait_all_timeout)
ircd::server::wait_all_timeout
{
{ "name", "ircd.server.wait_all.timeout" },
{ "default", 5L },
};
decltype(ircd::server::wait_all_max)
ircd::server::wait_all_max
{
{ "name", "ircd.server.wait_all.max" },
{ "default", 9L },
};
decltype(ircd::server::peers_alloc)
ircd::server::peers_alloc;
@ -115,12 +131,15 @@ ircd::server::wait()
[] { return !peer_unfinished(); }
};
while(!dock.wait_for(seconds(5), finished))
const size_t max(wait_all_max);
const seconds timeout(wait_all_timeout);
for(size_t i(0); i < max && !dock.wait_for(timeout, finished); ++i)
{
for(const auto &[name, peer] : peers)
log::dwarning
log::logf
{
log, "Waiting for peer %s tags:%zu links:%zu err:%b op[r:%b f:%b]",
log, log::level::DWARNING,
"Waiting for peer %s tags:%zu links:%zu err:%b op[r:%b f:%b]",
name,
peer->tag_count(),
peer->link_count(),