diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-04-08 23:57:15 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-04-08 23:57:15 -0700 |
| commit | f6a7e79dc370dfb2e3fe5bff6a380afde95b9a7f (patch) | |
| tree | 716ffa52d4efe0705789eb6b527f2c370a341f7e /weed/server/master_server.go | |
| parent | 2329d9e0c18aa2dbc2b843a43fe269ee539a0f39 (diff) | |
| download | seaweedfs-f6a7e79dc370dfb2e3fe5bff6a380afde95b9a7f.tar.xz seaweedfs-f6a7e79dc370dfb2e3fe5bff6a380afde95b9a7f.zip | |
weed shell: simplify CLI option for filer
Diffstat (limited to 'weed/server/master_server.go')
| -rw-r--r-- | weed/server/master_server.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 497990f29..4a264d432 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -197,8 +197,8 @@ func (ms *MasterServer) startAdminScripts() { v.SetDefault("master.maintenance.sleep_minutes", 17) sleepMinutes := v.GetInt("master.maintenance.sleep_minutes") - v.SetDefault("master.filer.default_filer_url", "http://localhost:8888/") - filerURL := v.GetString("master.filer.default_filer_url") + v.SetDefault("master.filer.default", "localhost:8888") + filerHostPort := v.GetString("master.filer.default") scriptLines := strings.Split(adminScripts, "\n") @@ -208,9 +208,10 @@ func (ms *MasterServer) startAdminScripts() { shellOptions.GrpcDialOption = security.LoadClientTLS(v, "grpc.master") shellOptions.Masters = &masterAddress - shellOptions.FilerHost, shellOptions.FilerPort, shellOptions.Directory, err = util.ParseFilerUrl(filerURL) + shellOptions.FilerHost, shellOptions.FilerPort, err = util.ParseHostPort(filerHostPort) + shellOptions.Directory = "/" if err != nil { - glog.V(0).Infof("failed to parse master.filer.default_filer_urll=%s : %v\n", filerURL, err) + glog.V(0).Infof("failed to parse master.filer.default = %s : %v\n", filerHostPort, err) return } |