opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 01:12:24 +08:00
Code Issues Projects Releases Wiki Activity

Bugfix: daemon wg sync

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-10-02 00:04:34 -07:00
parent ee1ba164d0
commit 381824477e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ipfs/init.go
View File

@ -2,9 +2,9 @@ package main
import ( import (
"encoding/base64" "encoding/base64"
"path/filepath"
"errors" "errors"
"os" "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/gonuts/flag"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander"

4
daemon/daemon.go
View File

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