Fix chain build goroutine leak

api/async_full.go

@@ -375,14 +375,17 @@ func (c *BosswaveClient) BuildChain(p *BuildChainParams) (chan *objects.DChain,
 	}
 	parts := strings.SplitN(p.URI, "/", 2)
 	if len(parts) != 2 {
+		close(status)
 		return nil, bwe.M(bwe.BadURI, "Bad URI")
 	}
 	rnsvk, err := c.BW().ResolveKey(parts[0])
 	if err != nil {
+		close(status)
 		return nil, err
 	}
 	cb := NewChainBuilder(c, crypto.FmtKey(rnsvk)+"/"+parts[1], p.Permissions, p.To, status)
 	if cb == nil {
+		close(status)
 		return nil, bwe.M(bwe.BadChainBuildParams, "Could not construct CB: bad params")
 	}
 	rv := make(chan *objects.DChain)

api/chainbuilder.go

@@ -153,6 +153,7 @@ func (b *ChainBuilder) Build() ([]*objects.DChain, error) {
 		uri:   b.uri,
 		perms: b.perms,
 	}
+	defer close(b.status)
 	copy(ck.target[:], b.target)
 	copy(ck.nsvk[:], b.nsvk)
 	cached, states := b.cl.bw.resolveBuiltChain(ck)
@@ -229,7 +230,6 @@ func (b *ChainBuilder) Build() ([]*objects.DChain, error) {
 		e = e.Next()
 	}
 	b.status <- "chain build operation complete"
-	close(b.status)
 	b.cl.bw.cacheBuiltChains(ck, rv)
 	return rv, nil
 }

bw.go

@@ -31,6 +31,8 @@ import (
 
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
+	startProfile()
+	defer stopProfile()
 	app := cli.NewApp()
 	app.Name = "bw2"
 	app.Usage = "BossWave 2 universal tool. Run public or private routers, manage DoTs and DChains, and more"
@@ -321,12 +323,12 @@ func main() {
 			Action:  cli.ActionFunc(actionInspect),
 			Flags: []cli.Flag{
 				cli.BoolFlag{
-					Name:		"publish, p",
-					Usage:	"publish inspected objects to the registry",
+					Name:  "publish, p",
+					Usage: "publish inspected objects to the registry",
 				},
 				cli.BoolFlag{
-					Name:		"qrcode, q",
-					Usage:	"makes QR Codes for entities with available siging keys",
+					Name:  "qrcode, q",
+					Usage: "makes QR Codes for entities with available siging keys",
 				},
 				bflag,
 			},

bw2_noprofile.go

@@ -0,0 +1,10 @@
+// +build !profiling
+
+package main
+
+func startProfile() {
+}
+
+func stopProfile() {
+
+}

bw2_profile.go

@@ -0,0 +1,16 @@
+// +build profiling
+
+package main
+
+import (
+	"net/http"
+	_ "net/http/pprof"
+)
+
+func startProfile() {
+	go http.ListenAndServe(":8080", http.DefaultServeMux)
+}
+
+func stopProfile() {
+
+}

util/version.go

@@ -1,8 +1,8 @@
 package util
 
 //The version of BW2 this is
-const BW2Version = "2.4.10 'Hadron'"
+const BW2Version = "2.4.11 'Hadron'"
 const BW2VersionMajor = 2
 const BW2VersionMinor = 4
-const BW2VersionSubminor = 10
+const BW2VersionSubminor = 11
 const BW2VersionName = "Hadron"