aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2019-01-10 09:10:07 -0800
committerGitHub <noreply@github.com>2019-01-10 09:10:07 -0800
commit8613e4f55826a2d12cf1559f643a6c68c872a11b (patch)
tree6f2dcc69b47502eee556e2089139bddfd4404c59
parent2d23d86fd3c543a9c4e1f1e8fbfcd23f7a23dd2b (diff)
parentb864cf7e070de43e5c6c5a86458c65bb371ec83e (diff)
downloadseaweedfs-8613e4f55826a2d12cf1559f643a6c68c872a11b.tar.xz
seaweedfs-8613e4f55826a2d12cf1559f643a6c68c872a11b.zip
Merge pull request #827 from suilongfei/master
change log_dir to logdir for the "flag redefined:log_dir" error when use another package with "github.com/golang/glog"
-rw-r--r--weed/glog/glog.go2
-rw-r--r--weed/glog/glog_file.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/glog/glog.go b/weed/glog/glog.go
index abd5678d4..f46632f1c 100644
--- a/weed/glog/glog.go
+++ b/weed/glog/glog.go
@@ -46,7 +46,7 @@
// -stderrthreshold=ERROR
// Log events at or above this severity are logged to standard
// error as well as to files.
-// -log_dir=""
+// -logdir=""
// Log files will be written to this directory instead of the
// default temporary directory.
//
diff --git a/weed/glog/glog_file.go b/weed/glog/glog_file.go
index 65075d281..bb8e6902f 100644
--- a/weed/glog/glog_file.go
+++ b/weed/glog/glog_file.go
@@ -38,7 +38,7 @@ var logDirs []string
// If non-empty, overrides the choice of directory in which to write logs.
// See createLogDirs for the full list of possible destinations.
-var logDir = flag.String("log_dir", "", "If non-empty, write log files in this directory")
+var logDir = flag.String("logdir", "", "If non-empty, write log files in this directory")
func createLogDirs() {
if *logDir != "" {