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

logind: use notify_start/notify_on_cleanup

Browse source 
Logging about the pid is dropped, pid1 does that better.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-10-15 19:20:05 +02:00
parent 297fc20dc4
commit 21fe744cfb
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/login/logind.c
View file

@ -14,6 +14,7 @@
#include "bus-log-control-api.h"
#include "bus-polkit.h"
#include "cgroup-util.h"
#include "daemon-util.h"
#include "def.h"
#include "device-util.h"
#include "dirent-util.h"
@ -1156,6 +1157,7 @@ static int manager_run(Manager *m) {
static int run(int argc, char *argv[]) {
_cleanup_(manager_unrefp) Manager *m = NULL;
_cleanup_(notify_on_cleanup) const char *notify_message = NULL;
int r;
log_set_facility(LOG_AUTH);
@ -1194,19 +1196,8 @@ static int run(int argc, char *argv[]) {
if (r < 0)
return log_error_errno(r, "Failed to fully start up daemon: %m");
log_debug("systemd-logind running as pid "PID_FMT, getpid_cached());
(void) sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
r = manager_run(m);
log_debug("systemd-logind stopped as pid "PID_FMT, getpid_cached());
(void) sd_notify(false,
"STOPPING=1\n"
"STATUS=Shutting down...");
return r;
notify_message = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
return manager_run(m);
}
DEFINE_MAIN_FUNCTION(run);