Bugfix: daemon wg sync

ipfs · Oct 2, 2014 · 874d612 · 874d612
1 parent 0d84af5
commit 874d612
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go
@@ -2,9 +2,9 @@ package main
 
 import (
 	"encoding/base64"
-	"path/filepath"
 	"errors"
 	"os"
+	"path/filepath"
 
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/gonuts/flag"
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander"

diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -94,15 +94,17 @@ func (dl *DaemonListener) Listen() {
 		panic("attempting to listen on a closed daemon Listener")
 	}
 
+	// add ourselves to workgroup. and remove ourselves when done.
 	dl.wg.Add(1)
+	defer dl.wg.Done()
+
 	log.Info("daemon listening")
 	for {
 		conn, err := dl.list.Accept()
 		if err != nil {
 			if !dl.closed {
 				log.Warning("DaemonListener Accept: %v", err)
 			}
-			dl.lk.Close()
 			return
 		}
 		go dl.handleConnection(conn)