Merge lp:~chipaca/ubuntu-push/fix-1383867--trunk into lp:ubuntu-push

[John Lenton]

make the common service Start(..) method take init, so we can listen for methods once everything is set up and not before.

make the common service Start(..) method take init, so we can listen for methods once everything is set up and not before.

[John Lenton (chipaca)]

this branch has been approved by pedronis (sitting here beside me).

review: Approve

=== modified file 'client/service/common.go'
--- client/service/common.go	2014-08-06 02:48:10 +0000
+++ client/service/common.go	2014-10-23 14:40:55 +0000
@@ -63,7 +63,7 @@
 }
 
 // Start() dials the bus, grab the name, and listens for method calls.
-func (svc *DBusService) Start(dispatchMap bus.DispatchMap, busAddr bus.Address) error {
+func (svc *DBusService) Start(dispatchMap bus.DispatchMap, busAddr bus.Address, init func() error) error {
 	svc.lock.Lock()
 	defer svc.lock.Unlock()
 	if svc.state != StateUnknown {
@@ -89,6 +89,11 @@
 			}
 		}
 	}()
+	if init != nil {
+		if err = init(); err != nil {
+			return err
+		}
+	}
 	svc.Bus.WatchMethod(dispatchMap, "/*", svc)
 	svc.state = StateRunning
 	return nil
 
=== modified file 'client/service/postal.go'
--- client/service/postal.go	2014-09-09 20:46:45 +0000
+++ client/service/postal.go	2014-10-23 14:40:55 +0000
@@ -141,16 +141,16 @@
 
 // Start() dials the bus, grab the name, and listens for method calls.
 func (svc *PostalService) Start() error {
-	err := svc.DBusService.Start(bus.DispatchMap{
+	return svc.DBusService.Start(bus.DispatchMap{
 		"PopAll":          svc.popAll,
 		"Post":            svc.post,
 		"ListPersistent":  svc.listPersistent,
 		"ClearPersistent": svc.clearPersistent,
 		"SetCounter":      svc.setCounter,
-	}, PostalServiceBusAddress)
-	if err != nil {
-		return err
-	}
+	}, PostalServiceBusAddress, svc.init)
+}
+
+func (svc *PostalService) init() error {
 	actionsCh, err := svc.takeTheBus()
 	if err != nil {
 		return err
 
=== modified file 'client/service/service.go'
--- client/service/service.go	2014-07-14 19:51:43 +0000
+++ client/service/service.go	2014-10-23 14:40:55 +0000
@@ -89,7 +89,7 @@
 	return svc.DBusService.Start(bus.DispatchMap{
 		"Register":   svc.register,
 		"Unregister": svc.unregister,
-	}, PushServiceBusAddress)
+	}, PushServiceBusAddress, nil)
 }
 
 var (