Merge pull request #50 from aelsabbahy/feature/lazy_dbus

Load dbus lazily
goss-org · Mar 12, 2016 · fc49302 · fc49302
2 parents 04d3850 + a8cc8c2
commit fc49302
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/system/service_dbus.go b/system/service_dbus.go
@@ -15,7 +15,7 @@ type ServiceDbus struct {
 func NewServiceDbus(service string, system *System, config util.Config) Service {
 	return &ServiceDbus{
 		service: service,
-		dbus:    system.Dbus,
+		dbus:    system.Dbus(),
 	}
 }
 

diff --git a/system/system.go b/system/system.go
@@ -33,8 +33,9 @@ type System struct {
 	NewDNS      func(string, *System, util2.Config) DNS
 	NewProcess  func(string, *System, util2.Config) Process
 	NewGossfile func(string, *System, util2.Config) Gossfile
-	Dbus        *dbus.Conn
+	dbus        *dbus.Conn
 	ports       map[string][]GOnetstat.Process
+	dbusOnce    sync.Once
 	portsOnce   sync.Once
 	procOnce    sync.Once
 	procMap     map[string][]ps.Process
@@ -47,6 +48,19 @@ func (s *System) Ports() map[string][]GOnetstat.Process {
 	return s.ports
 }
 
+func (s *System) Dbus() *dbus.Conn {
+	s.dbusOnce.Do(func() {
+		dbus, err := dbus.New()
+		if err != nil {
+			fmt.Println(err)
+			// FIXME: Do we really want to exit here?
+			os.Exit(1)
+		}
+		s.dbus = dbus
+	})
+	return s.dbus
+}
+
 func (s *System) ProcMap() map[string][]ps.Process {
 	s.procOnce.Do(func() {
 		s.procMap = GetProcs()
@@ -102,12 +116,6 @@ func (s *System) detectService() {
 	switch {
 	case util.IsRunningSystemd():
 		s.NewService = NewServiceDbus
-		dbus, err := dbus.New()
-		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-		s.Dbus = dbus
 	case isUbuntu():
 		s.NewService = NewServiceUpstart
 	case isAlpine():