lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: DBus cleanup

Browse Source
This commit is contained in:
Jonathan Gold
2018-05-05 10:26:29 -04:00
committed by James Shubin
parent a407771eaf
commit 299080f590
3 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
engine/resources/nspawn.go
View File

@@ -38,9 +38,9 @@ import (
const (
running = "running"
stopped = "stopped"
dbusInterface = "org.freedesktop.machine1.Manager"
machineNew = "org.freedesktop.machine1.Manager.MachineNew"
machineRemoved = "org.freedesktop.machine1.Manager.MachineRemoved"
dbusMachine1Iface = "org.freedesktop.machine1.Manager"
machineNew = dbusMachine1Iface + ".MachineNew"
machineRemoved = dbusMachine1Iface + ".MachineRemoved"
nspawnServiceTmpl = "systemd-nspawn@%s"
)
@@ -155,13 +155,12 @@ func (obj *NspawnRes) Watch() error {
defer bus.Close()
// add a match rule to match messages going through the message bus
call := bus.BusObject().Call(engineUtil.DBusAddMatch, 0,
fmt.Sprintf("type='signal',interface='%s',eavesdrop='true'",
dbusInterface))
// <-call.Done
if err := call.Err; err != nil {
args := fmt.Sprintf("type='signal',interface='%s',eavesdrop='true'", dbusMachine1Iface)
if call := bus.BusObject().Call(engineUtil.DBusAddMatch, 0, args); call.Err != nil {
return err
}
defer bus.BusObject().Call(engineUtil.DBusRemoveMatch, 0, args) // ignore the error
busChan := make(chan *dbus.Signal)
defer close(busChan)
bus.Signal(busChan)