diff options
| author | Chris Lu <chris.lu@gmail.com> | 2017-02-12 21:58:44 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2017-02-12 21:58:44 -0800 |
| commit | 41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506 (patch) | |
| tree | 92ea9772e8e0169a1a97af78a04de9f39eb29c13 /weed/command/master.go | |
| parent | 98d66a569b0b1ee1ef0b58fbf3bd0fa2fc917f5d (diff) | |
| download | seaweedfs-41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506.tar.xz seaweedfs-41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506.zip | |
remove weeds.conf
Diffstat (limited to 'weed/command/master.go')
| -rw-r--r-- | weed/command/master.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/weed/command/master.go b/weed/command/master.go index aed92fa33..09089a4f9 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -41,7 +41,6 @@ var ( volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.") volumePreallocate = cmdMaster.Flag.Bool("volumePreallocate", false, "Preallocate disk space for volumes.") mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") - confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "Deprecating! xml configuration file") defaultReplicaPlacement = cmdMaster.Flag.String("defaultReplication", "000", "Default replication type if not specified.") // mTimeout = cmdMaster.Flag.Int("idleTimeout", 30, "connection idle seconds") mMaxCpu = cmdMaster.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") @@ -79,7 +78,7 @@ func runMaster(cmd *Command, args []string) bool { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, *mport, *metaFolder, *volumeSizeLimitMB, *volumePreallocate, - *mpulse, *confFile, *defaultReplicaPlacement, *garbageThreshold, + *mpulse, *defaultReplicaPlacement, *garbageThreshold, masterWhiteList, *masterSecureKey, ) |