From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 29 Jan 2015 03:51:23 +0000 (+1100)
Subject: Provide HTTP pprof via envpprof package
X-Git-Tag: v1.0.0~1352
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=40593a741e57a5e85ef5bb627933721404344b62;p=btrtrc.git

Provide HTTP pprof via envpprof package
---

diff --git a/cmd/dht-get-peers/main.go b/cmd/dht-get-peers/main.go
index 75d52e09..40adb32e 100644
--- a/cmd/dht-get-peers/main.go
+++ b/cmd/dht-get-peers/main.go
@@ -9,6 +9,8 @@ import (
 	"os"
 	"os/signal"
 
+	_ "github.com/anacrolix/envpprof"
+
 	"bitbucket.org/anacrolix/go.torrent/dht"
 	"bitbucket.org/anacrolix/go.torrent/util"
 	_ "bitbucket.org/anacrolix/go.torrent/util/profile"
@@ -129,7 +131,6 @@ func setupSignals() {
 }
 
 func main() {
-	util.LoggedHTTPServe("")
 	seen := make(map[util.CompactPeer]struct{})
 getPeers:
 	for {
diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index 121a7b83..54a541ce 100644
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@ -10,16 +10,16 @@ import (
 	"os"
 	"strings"
 
+	_ "github.com/anacrolix/envpprof"
+
 	"github.com/anacrolix/libtorgo/metainfo"
 
 	"bitbucket.org/anacrolix/go.torrent"
-	"bitbucket.org/anacrolix/go.torrent/util"
 )
 
 var (
 	downloadDir = flag.String("downloadDir", "", "directory to store download torrent data")
 	testPeer    = flag.String("testPeer", "", "bootstrap peer address")
-	httpAddr    = flag.String("httpAddr", "localhost:6061", "http serve address")
 	// TODO: Check the default torrent listen port.
 	listenAddr      = flag.String("listenAddr", ":50007", "incoming connection address")
 	disableTrackers = flag.Bool("disableTrackers", false, "disable trackers")
@@ -30,9 +30,6 @@ var (
 func main() {
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 	flag.Parse()
-	if *httpAddr != "" {
-		util.LoggedHTTPServe(*httpAddr)
-	}
 	client, err := torrent.NewClient(&torrent.Config{
 		DataDir:         *downloadDir,
 		DisableTrackers: *disableTrackers,
diff --git a/cmd/torrentfs/main.go b/cmd/torrentfs/main.go
index b8a82535..328e65dd 100644
--- a/cmd/torrentfs/main.go
+++ b/cmd/torrentfs/main.go
@@ -13,7 +13,8 @@ import (
 	"syscall"
 	"time"
 
-	"bitbucket.org/anacrolix/go.torrent/util"
+	_ "github.com/anacrolix/envpprof"
+
 	"bitbucket.org/anacrolix/go.torrent/util/dirwatch"
 
 	"bazil.org/fuse"
@@ -35,7 +36,6 @@ var (
 
 	disableTrackers = flag.Bool("disableTrackers", false, "disables trackers")
 	testPeer        = flag.String("testPeer", "", "the address for a test peer")
-	httpAddr        = flag.String("httpAddr", "localhost:0", "HTTP server bind address")
 	readaheadBytes  = flag.Int64("readaheadBytes", 10*1024*1024, "bytes to readahead in each torrent from the last read piece")
 	listenAddr      = flag.String("listenAddr", ":6882", "incoming connection address")
 
@@ -90,9 +90,6 @@ func main() {
 		os.Exit(2)
 	}
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
-	if *httpAddr != "" {
-		util.LoggedHTTPServe(*httpAddr)
-	}
 	conn, err := fuse.Mount(*mountDir)
 	if err != nil {
 		log.Fatal(err)