Merge pull request #172 from QuentinPerez/fix-daemon-close

daemon: fix close, don't use copy constructor
moul · Aug 25, 2016 · b8d3d61 · b8d3d61
2 parents 9f1b722 + 07859b4
commit b8d3d61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/config/hook.go b/pkg/config/hook.go
@@ -19,7 +19,7 @@ func (hh *HostHooks) Length() int {
 	if hh == nil {
 		return 0
 	}
-	return len(hh.OnConnect) + len(hh.OnDisconnect)
+	return len(hh.OnConnect) + len(hh.OnDisconnect) + len(hh.BeforeConnect) + len(hh.OnConnectError)
 }
 
 // String returns the JSON output

diff --git a/pkg/hooks/driver_daemon.go b/pkg/hooks/driver_daemon.go
@@ -16,14 +16,14 @@ type DaemonDriver struct {
 }
 
 // NewDaemonDriver returns a DaemonDriver instance
-func NewDaemonDriver(line string) (DaemonDriver, error) {
-	return DaemonDriver{
+func NewDaemonDriver(line string) (*DaemonDriver, error) {
+	return &DaemonDriver{
 		line: line,
 	}, nil
 }
 
 // Run daemons a line to the terminal
-func (d DaemonDriver) Run(args RunArgs) error {
+func (d *DaemonDriver) Run(args RunArgs) error {
 	var buff bytes.Buffer
 	tmpl, err := templates.New(d.line + "\n")
 	if err != nil {
@@ -51,7 +51,7 @@ func (d DaemonDriver) Run(args RunArgs) error {
 }
 
 // Close closes a running command
-func (d DaemonDriver) Close() error {
+func (d *DaemonDriver) Close() error {
 	if d.cmd == nil || d.cmd.Process == nil {
 		return nil
 	}