Merge pull request #186 from cryptix/fixDebug

fix IPFS_DEBUG (was set after SetupLogging)

Merge pull request #186 from cryptix/fixDebug
fix IPFS_DEBUG (was set after SetupLogging)
a7bca102 · Juan Batiz-Benet · bbfba910 · 02659c68 · a7bca102 · a7bca102
Commit a7bca102 authored Oct 18, 2014 by Juan Batiz-Benet
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

cmd/ipfs/ipfs.go cmd/ipfs/ipfs.go +0 -2

util/log.go util/log.go +1 -0

No files found.
--- a/cmd/ipfs/ipfs.go
+++ b/cmd/ipfs/ipfs.go
@@ -86,8 +86,6 @@ func ipfsCmd(c *commander.Command, args []string) error {
 }

 func main() {
-	u.Debug = u.GetenvBool("IPFS_DEBUG")
-
 	// if debugging, setup profiling.
 	if u.Debug {
 		ofi, err := os.Create("cpu.prof")

--- a/util/log.go
+++ b/util/log.go
@@ -41,6 +41,7 @@ func SetupLogging() {
 		}
 	}

+	Debug = GetenvBool("IPFS_DEBUG")
 	if Debug {
 		lvl = logging.DEBUG
 	}