0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-07 04:28:59 +02:00

construct: Do signaled conf rehash in an ircd::ctx and only in runlevel::RUN.

This commit is contained in:
Jason Volk 2018-05-28 03:23:40 -07:00
parent c8902654a0
commit a1a3c60277

View file

@ -335,12 +335,34 @@ void
handle_usr1()
try
{
static ircd::m::import<void ()> rehash_conf
// Spawning the context that follows this branch and doing a rehash
// when not in a stable state like runlevel::RUN will just make a mess
// so any signal received is just dropped and the user can try again.
if(ircd::runlevel != ircd::runlevel::RUN)
{
"s_conf", "rehash_conf"
};
ircd::log::warning
{
"Not rehashing conf from SIGUSR1 in runlevel %s",
reflect(ircd::runlevel)
};
rehash_conf();
return;
}
// This signal handler (though not a *real* signal handler) is still
// running on the main async stack and not an ircd::ctx. The rehash
// function does a lot of IO so it requires an ircd::ctx. Note that
// because this is the main stack, the ircd::context{} will return
// immediately (no waiting/join can occur) but will execute later.
ircd::context{[]
{
ircd::m::import<void ()> rehash_conf
{
"s_conf", "rehash_conf"
};
rehash_conf();
}};
}
catch(const std::exception &e)
{