From 921f1c626a2e511f5082df1aaa91a39f57a48b3a Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sat, 19 Jan 2013 19:49:57 -0800
Subject: [PATCH] fix debug message displaying

---
 weed-fs/src/cmd/weed/command.go |  2 ++
 weed-fs/src/cmd/weed/fix.go     | 16 ++++++++--------
 weed-fs/src/cmd/weed/master.go  |  2 +-
 weed-fs/src/cmd/weed/upload.go  |  2 +-
 weed-fs/src/cmd/weed/volume.go  |  2 +-
 weed-fs/src/cmd/weed/weed.go    |  1 +
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/weed-fs/src/cmd/weed/command.go b/weed-fs/src/cmd/weed/command.go
index 4d68ff151..c8d86ca66 100644
--- a/weed-fs/src/cmd/weed/command.go
+++ b/weed-fs/src/cmd/weed/command.go
@@ -24,6 +24,8 @@ type Command struct {
 
 	// Flag is a set of flags specific to this command.
 	Flag flag.FlagSet
+
+	IsDebug *bool
 }
 
 // Name returns the command's name: the first word in the usage line.
diff --git a/weed-fs/src/cmd/weed/fix.go b/weed-fs/src/cmd/weed/fix.go
index 7bed70edd..d794374cb 100644
--- a/weed-fs/src/cmd/weed/fix.go
+++ b/weed-fs/src/cmd/weed/fix.go
@@ -10,11 +10,11 @@ import (
 
 func init() {
 	cmdFix.Run = runFix // break init cycle
-	IsDebug = cmdFix.Flag.Bool("debug", false, "enable debug mode")
+	cmdFix.IsDebug = cmdFix.Flag.Bool("debug", false, "enable debug mode")
 }
 
 var cmdFix = &Command{
-	UsageLine: "fix -dir=/tmp -volumeId=234 -debug=1",
+	UsageLine: "fix -dir=/tmp -volumeId=234",
 	Short:     "run weed tool fix on index file if corrupted",
 	Long: `Fix runs the WeedFS fix command to re-create the index .idx file.
 
@@ -22,23 +22,23 @@ var cmdFix = &Command{
 }
 
 var (
-	dir      = cmdFix.Flag.String("dir", "/tmp", "data directory to store files")
-	volumeId = cmdFix.Flag.Int("volumeId", -1, "a non-negative volume id. The volume should already exist in the dir. The volume index file should not exist.")
+	fixVolumePath = cmdFix.Flag.String("dir", "/tmp", "data directory to store files")
+	fixVolumeId   = cmdFix.Flag.Int("volumeId", -1, "a volume id. The volume should already exist in the dir. The volume index file should not exist.")
 )
 
 func runFix(cmd *Command, args []string) bool {
 
-	if *volumeId == -1 {
+	if *fixVolumeId == -1 {
 		return false
 	}
 
-	fileName := strconv.Itoa(*volumeId)
-	dataFile, e := os.OpenFile(path.Join(*dir, fileName+".dat"), os.O_RDONLY, 0644)
+	fileName := strconv.Itoa(*fixVolumeId)
+	dataFile, e := os.OpenFile(path.Join(*fixVolumePath, fileName+".dat"), os.O_RDONLY, 0644)
 	if e != nil {
 		log.Fatalf("Read Volume [ERROR] %s\n", e)
 	}
 	defer dataFile.Close()
-	indexFile, ie := os.OpenFile(path.Join(*dir, fileName+".idx"), os.O_WRONLY|os.O_CREATE, 0644)
+	indexFile, ie := os.OpenFile(path.Join(*fixVolumePath, fileName+".idx"), os.O_WRONLY|os.O_CREATE, 0644)
 	if ie != nil {
 		log.Fatalf("Create Volume Index [ERROR] %s\n", ie)
 	}
diff --git a/weed-fs/src/cmd/weed/master.go b/weed-fs/src/cmd/weed/master.go
index c60974a67..07abcf0dc 100644
--- a/weed-fs/src/cmd/weed/master.go
+++ b/weed-fs/src/cmd/weed/master.go
@@ -16,7 +16,7 @@ import (
 
 func init() {
 	cmdMaster.Run = runMaster // break init cycle
-	IsDebug = cmdMaster.Flag.Bool("debug", false, "enable debug mode")
+	cmdMaster.IsDebug = cmdMaster.Flag.Bool("debug", false, "enable debug mode")
 }
 
 var cmdMaster = &Command{
diff --git a/weed-fs/src/cmd/weed/upload.go b/weed-fs/src/cmd/weed/upload.go
index 5707fda56..8ce0674f4 100644
--- a/weed-fs/src/cmd/weed/upload.go
+++ b/weed-fs/src/cmd/weed/upload.go
@@ -15,7 +15,7 @@ var uploadReplication *string
 
 func init() {
 	cmdUpload.Run = runUpload // break init cycle
-	IsDebug = cmdUpload.Flag.Bool("debug", false, "verbose debug information")
+	cmdUpload.IsDebug = cmdUpload.Flag.Bool("debug", false, "verbose debug information")
 	server = cmdUpload.Flag.String("server", "localhost:9333", "weedfs master location")
 	uploadReplication = cmdUpload.Flag.String("replication", "000", "replication type(000,001,010,100,110,200)")
 }
diff --git a/weed-fs/src/cmd/weed/volume.go b/weed-fs/src/cmd/weed/volume.go
index 576096dbb..4ee8c31a5 100644
--- a/weed-fs/src/cmd/weed/volume.go
+++ b/weed-fs/src/cmd/weed/volume.go
@@ -17,7 +17,7 @@ import (
 
 func init() {
 	cmdVolume.Run = runVolume // break init cycle
-	IsDebug = cmdVolume.Flag.Bool("debug", false, "enable debug mode")
+	cmdVolume.IsDebug = cmdVolume.Flag.Bool("debug", false, "enable debug mode")
 }
 
 var cmdVolume = &Command{
diff --git a/weed-fs/src/cmd/weed/weed.go b/weed-fs/src/cmd/weed/weed.go
index e2eb41ced..e3ffc013b 100644
--- a/weed-fs/src/cmd/weed/weed.go
+++ b/weed-fs/src/cmd/weed/weed.go
@@ -65,6 +65,7 @@ func main() {
 			cmd.Flag.Usage = func() { cmd.Usage() }
 			cmd.Flag.Parse(args[1:])
 			args = cmd.Flag.Args()
+			*IsDebug = *cmd.IsDebug
 			if !cmd.Run(cmd, args) {
 				fmt.Fprintf(os.Stderr, "\n")
 				cmd.Flag.Usage()