Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

systemd: get dbus connection directly in NewSystemdUnitManager #1635

Merged
merged 1 commit into from
Jul 15, 2016
+7 −8
Merged

systemd: get dbus connection directly in NewSystemdUnitManager #1635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions systemd/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ type systemdUnitManager struct {
}

func NewSystemdUnitManager(uDir string, systemdUser bool) (*systemdUnitManager, error) {
systemd, err := createDbusConnection(systemdUser)
var systemd *dbus.Conn
var err error
if systemdUser {
systemd, err = dbus.NewUserConnection()
} else {
systemd, err = dbus.New()
}
if err != nil {
return nil, err
}
Expand All @@ -60,13 +66,6 @@ func NewSystemdUnitManager(uDir string, systemdUser bool) (*systemdUnitManager,
return &mgr, nil
}

func createDbusConnection(systemdUser bool) (*dbus.Conn, error) {
if systemdUser {
return dbus.NewUserConnection()
}
return dbus.New()
}

func hashUnitFiles(dir string) (map[string]unit.Hash, error) {
uNames, err := lsUnitsDir(dir)
if err != nil {
Expand Down