mirror of
https://github.com/systemd/systemd.git
synced 2025-05-27 21:05:55 +03:00
core: log disconnect on api and system busses, and dump list of subscribers (#35603)
Split out of #35406.
This commit is contained in:
commit
3fbc35bf9a
@ -131,10 +131,16 @@ static int signal_disconnected(sd_bus_message *message, void *userdata, sd_bus_e
|
|||||||
assert(message);
|
assert(message);
|
||||||
assert_se(bus = sd_bus_message_get_bus(message));
|
assert_se(bus = sd_bus_message_get_bus(message));
|
||||||
|
|
||||||
if (bus == m->api_bus)
|
if (bus == m->api_bus) {
|
||||||
|
log_notice("Got disconnect on API bus.");
|
||||||
bus_done_api(m);
|
bus_done_api(m);
|
||||||
if (bus == m->system_bus)
|
}
|
||||||
|
if (bus == m->system_bus) {
|
||||||
|
/* If we are the system manager, this is already logged by the API bus. */
|
||||||
|
if (!MANAGER_IS_SYSTEM(m))
|
||||||
|
log_notice("Got disconnect on system bus.");
|
||||||
bus_done_system(m);
|
bus_done_system(m);
|
||||||
|
}
|
||||||
|
|
||||||
if (set_remove(m->private_buses, bus)) {
|
if (set_remove(m->private_buses, bus)) {
|
||||||
log_debug("Got disconnect on private connection.");
|
log_debug("Got disconnect on private connection.");
|
||||||
|
@ -77,6 +77,9 @@ static void manager_dump_header(Manager *m, FILE *f, const char *prefix) {
|
|||||||
timestamp_is_set(t->realtime) ? FORMAT_TIMESTAMP(t->realtime) :
|
timestamp_is_set(t->realtime) ? FORMAT_TIMESTAMP(t->realtime) :
|
||||||
FORMAT_TIMESPAN(t->monotonic, 1));
|
FORMAT_TIMESPAN(t->monotonic, 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (const char *n = sd_bus_track_first(m->subscribed); n; n = sd_bus_track_next(m->subscribed))
|
||||||
|
fprintf(f, "%sSubscribed: %s\n", strempty(prefix), n);
|
||||||
}
|
}
|
||||||
|
|
||||||
void manager_dump(Manager *m, FILE *f, char **patterns, const char *prefix) {
|
void manager_dump(Manager *m, FILE *f, char **patterns, const char *prefix) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user