shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

dbus: suppress duplicate and misleading messages

Browse Source 
When we try to send a signal on a connection we didn't hae the time to
process the Disconnected message yet, don't generate multiple warning
messages, but only a single debug message.

https://bugs.freedesktop.org/show_bug.cgi?id=75874
This commit is contained in:
Lennart Poettering 2014-03-11 04:10:19 +01:00
parent 7ced1d8f87
commit fe7f06f142
Notes: Lennart Poettering 2014-03-11 04:21:03 +01:00 
Backport: bugfix
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/dbus-manager.c
View File

@ -1386,8 +1386,11 @@ static int reply_unit_file_changes_and_free(
unsigned i;
int r;
if (n_changes > 0)
bus_foreach_bus(m, NULL, send_unit_files_changed, NULL);
if (n_changes > 0) {
r = bus_foreach_bus(m, NULL, send_unit_files_changed, NULL);
if (r < 0)
log_debug("Failed to send UnitFilesChanged signal: %s", strerror(-r));
}
r = sd_bus_message_new_method_return(message, &reply);
if (r < 0)

12
src/core/dbus-unit.c
View File

@ -638,21 +638,13 @@ static int send_changed_signal(sd_bus *bus, void *userdata) {
bus, p,
UNIT_VTABLE(u)->bus_interface,
NULL);
if (r < 0) {
log_warning("Failed to send out specific PropertiesChanged signal for %s: %s", u->id, strerror(-r));
if (r < 0)
return r;
}
r = sd_bus_emit_properties_changed_strv(
return sd_bus_emit_properties_changed_strv(
bus, p,
"org.freedesktop.systemd1.Unit",
NULL);
if (r < 0) {
log_warning("Failed to send out generic PropertiesChanged signal for %s: %s", u->id, strerror(-r));
return r;
}
return 0;
}
void bus_unit_send_change_signal(Unit *u) {