dbus: make sure to flush bus connection before disconnecting, so that no messages are lost
This commit is contained in:
parent
18ffdfda48
commit
5d452f9cec
4
fixme
4
fixme
|
@ -80,12 +80,8 @@ v9:
|
||||||
|
|
||||||
* fix terminal setup
|
* fix terminal setup
|
||||||
|
|
||||||
* figure out ssh disconnect hang
|
|
||||||
|
|
||||||
* home.mount failing should not be able to cancel umount.target (IgnoreDependencyFailure=yes borked?)
|
* home.mount failing should not be able to cancel umount.target (IgnoreDependencyFailure=yes borked?)
|
||||||
|
|
||||||
* disallow further dbus+socket activation on shutdown
|
|
||||||
|
|
||||||
External:
|
External:
|
||||||
|
|
||||||
* place /etc/inittab with explaining blurb.
|
* place /etc/inittab with explaining blurb.
|
||||||
|
|
|
@ -82,6 +82,7 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
finish:
|
finish:
|
||||||
if (bus) {
|
if (bus) {
|
||||||
|
dbus_connection_flush(bus);
|
||||||
dbus_connection_close(bus);
|
dbus_connection_close(bus);
|
||||||
dbus_connection_unref(bus);
|
dbus_connection_unref(bus);
|
||||||
}
|
}
|
||||||
|
|
|
@ -232,8 +232,9 @@ static void server_done(Server *s) {
|
||||||
close_nointr_nofail(s->epoll_fd);
|
close_nointr_nofail(s->epoll_fd);
|
||||||
|
|
||||||
if (s->bus) {
|
if (s->bus) {
|
||||||
dbus_connection_close(s->bus);
|
dbus_connection_flush(s->bus);
|
||||||
dbus_connection_unref(s->bus);
|
dbus_connection_close(s->bus);
|
||||||
|
dbus_connection_unref(s->bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4624,6 +4624,7 @@ finish:
|
||||||
dbus_message_unref(reply);
|
dbus_message_unref(reply);
|
||||||
|
|
||||||
if (bus) {
|
if (bus) {
|
||||||
|
dbus_connection_flush(bus);
|
||||||
dbus_connection_close(bus);
|
dbus_connection_close(bus);
|
||||||
dbus_connection_unref(bus);
|
dbus_connection_unref(bus);
|
||||||
}
|
}
|
||||||
|
@ -5039,6 +5040,7 @@ int main(int argc, char*argv[]) {
|
||||||
finish:
|
finish:
|
||||||
|
|
||||||
if (bus) {
|
if (bus) {
|
||||||
|
dbus_connection_flush(bus);
|
||||||
dbus_connection_close(bus);
|
dbus_connection_close(bus);
|
||||||
dbus_connection_unref(bus);
|
dbus_connection_unref(bus);
|
||||||
}
|
}
|
||||||
|
|
|
@ -406,8 +406,9 @@ finish:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (c.bus) {
|
if (c.bus) {
|
||||||
dbus_connection_close(c.bus);
|
dbus_connection_flush(c.bus);
|
||||||
dbus_connection_unref(c.bus);
|
dbus_connection_close(c.bus);
|
||||||
|
dbus_connection_unref(c.bus);
|
||||||
}
|
}
|
||||||
|
|
||||||
dbus_error_free(&error);
|
dbus_error_free(&error);
|
||||||
|
|
Loading…
Reference in New Issue