picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: rework how we set the objective to MANAGER_OK 

Let's do so already when we are about to complete startup/reload, so
that manager_catchup() is run in a context where MANAGER_IS_RUNNING()
returns true, as the intention is.

Fixes: #9518
This commit is contained in:
Lennart Poettering 2018-10-09 17:58:08 +02:00
parent 3ca4d0b3eb
commit 1fb70e6648
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/manager.c
View File

@ -1680,6 +1680,8 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
m->send_reloading_done = true;
}
m->objective = MANAGER_OK;
/* It might be safe to log to the journal now and connect to dbus */
manager_recheck_journal(m);
manager_recheck_dbus(m);
@ -2811,7 +2813,7 @@ int manager_loop(Manager *m) {
RATELIMIT_DEFINE(rl, 1*USEC_PER_SEC, 50000);
assert(m);
m->objective = MANAGER_OK;
assert(m->objective == MANAGER_OK); /* Ensure manager_startup() has been called */
/* Release the path cache */
m->unit_path_cache = set_free_free(m->unit_path_cache);
@ -3550,6 +3552,7 @@ int manager_reload(Manager *m) {
/* Consider the reload process complete now. */
assert(m->n_reloading > 0);
m->n_reloading--;
m->objective = MANAGER_OK;
/* It might be safe to log to the journal now and connect to dbus */
manager_recheck_journal(m);