diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-12-22 11:37:09 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-12-23 23:31:35 +0100 |
| commit | 8936a5e34dbfa9274348f3fef99f7c9f9327ddf9 (patch) | |
| tree | 81f2cf8438bb9ecaaffae9451d8c8cec0f898e87 /src/core/manager.c | |
| parent | a6cff5d3c0e9a5aef3f1440b089fdb9f30bf444f (diff) | |
core: re-sync bus name list after deserializing during daemon-reload
When the daemon reloads, it doesn not actually give up its DBus connection,
as wrongly stated in an earlier commit. However, even though the bus
connection stays open, the daemon flushes out all its internal state.
Hence, if there is a NameOwnerChanged signal after the flush and before the
deserialization, it cannot be matched against any pending unit.
To fix this, rename bus_list_names() to manager_sync_bus_names() and call
it explicitly at the end of the daemon reload operation.
Diffstat (limited to 'src/core/manager.c')
| -rw-r--r-- | src/core/manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index e65616adc1..ffe27be743 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2574,6 +2574,10 @@ int manager_reload(Manager *m) { /* Third, fire things up! */ manager_coldplug(m); + /* Sync current state of bus names with our set of listening units */ + if (m->api_bus) + manager_sync_bus_names(m, m->api_bus); + assert(m->n_reloading > 0); m->n_reloading--; |