shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-10 16:58:28 +03:00
Code

update-utmp: do not give up if the first attempt at connecting bus failed

Browse Source 
Otherwise, the program exits with failure if the first attempt in run() failed:
```
Dec 18 20:27:37 systemd-update-utmp[254]: Bus n/a: changing state UNSET → OPENING
Dec 18 20:27:37 systemd-update-utmp[254]: sd-bus: starting bus by connecting to /run/systemd/private...
Dec 18 20:27:37 systemd-update-utmp[254]: Bus n/a: changing state OPENING → CLOSED
Dec 18 20:27:37 systemd-update-utmp[254]: Failed to get D-Bus connection: Connection refused
```
This commit is contained in:
Yu Watanabe 2024-12-18 22:27:29 +09:00
parent 67e5622bfe
commit 85d040dabd
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/update-utmp/update-utmp.c
View File

@ -53,6 +53,12 @@ static int get_startup_monotonic_time(Context *c, usec_t *ret) {
assert(c);
assert(ret);
if (!c->bus) {
r = bus_connect_system_systemd(&c->bus);
if (r < 0)
return log_warning_errno(r, "Failed to get D-Bus connection, ignoring: %m");
}
r = bus_get_property_trivial(
c->bus,
bus_systemd_mgr,
@ -94,10 +100,13 @@ static int get_current_runlevel(Context *c) {
UINT64_C(100) * USEC_PER_MSEC +
random_u64_range(UINT64_C(1900) * USEC_PER_MSEC * n_attempts / MAX_ATTEMPTS);
(void) usleep_safe(usec);
}
if (!c->bus) {
r = bus_connect_system_systemd(&c->bus);
if (r == -ECONNREFUSED && n_attempts < 64) {
log_debug_errno(r, "Failed to reconnect to system bus, retrying after a slight delay: %m");
log_debug_errno(r, "Failed to %s to system bus, retrying after a slight delay: %m",
n_attempts <= 1 ? "connect" : "reconnect");
continue;
}
if (r < 0)
@ -251,7 +260,6 @@ static int run(int argc, char *argv[]) {
.audit_fd = -EBADF,
#endif
};
int r;
log_setup();
@ -264,9 +272,6 @@ static int run(int argc, char *argv[]) {
log_full_errno(IN_SET(errno, EAFNOSUPPORT, EPROTONOSUPPORT) ? LOG_DEBUG : LOG_WARNING,
errno, "Failed to connect to audit log, ignoring: %m");
#endif
r = bus_connect_system_systemd(&c.bus);
if (r < 0)
return log_error_errno(r, "Failed to get D-Bus connection: %m");
return dispatch_verb(argc, argv, verbs, &c);
}