diff options
| author | Jonathan Amsterdam <jba@google.com> | 2019-03-20 16:02:38 -0400 |
|---|---|---|
| committer | Jonathan Amsterdam <jba@google.com> | 2019-03-20 16:02:38 -0400 |
| commit | e966033098ce13fdda97dd96b309357bd410d8d6 (patch) | |
| tree | dd401620f393d366e6c6ab80c15589eadfa2aea2 /weed/command/mount.go | |
| parent | 8db82e2b75eb67bc58a4869cc70fb8c5b2c0b97c (diff) | |
| parent | 977b30e992108e480c883cdd461bf0c8f6598f25 (diff) | |
| download | seaweedfs-e966033098ce13fdda97dd96b309357bd410d8d6.tar.xz seaweedfs-e966033098ce13fdda97dd96b309357bd410d8d6.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs into gocdk
Diffstat (limited to 'weed/command/mount.go')
| -rw-r--r-- | weed/command/mount.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/weed/command/mount.go b/weed/command/mount.go index 760c68e40..ec790c999 100644 --- a/weed/command/mount.go +++ b/weed/command/mount.go @@ -8,7 +8,6 @@ import ( type MountOptions struct { filer *string - filerGrpcPort *int filerMountRootPath *string dir *string dirListingLimit *int @@ -29,7 +28,6 @@ var ( func init() { cmdMount.Run = runMount // break init cycle mountOptions.filer = cmdMount.Flag.String("filer", "localhost:8888", "weed filer location") - mountOptions.filerGrpcPort = cmdMount.Flag.Int("filer.grpc.port", 0, "filer grpc server listen port, default to http port + 10000") mountOptions.filerMountRootPath = cmdMount.Flag.String("filer.path", "/", "mount this remote path from filer server") mountOptions.dir = cmdMount.Flag.String("dir", ".", "mount weed filer to this directory") mountOptions.dirListingLimit = cmdMount.Flag.Int("dirListLimit", 100000, "limit directory listing size") @@ -61,7 +59,7 @@ var cmdMount = &Command{ `, } -func parseFilerGrpcAddress(filer string, optionalGrpcPort int) (filerGrpcAddress string, err error) { +func parseFilerGrpcAddress(filer string) (filerGrpcAddress string, err error) { hostnameAndPort := strings.Split(filer, ":") if len(hostnameAndPort) != 2 { return "", fmt.Errorf("The filer should have hostname:port format: %v", hostnameAndPort) @@ -73,9 +71,6 @@ func parseFilerGrpcAddress(filer string, optionalGrpcPort int) (filerGrpcAddress } filerGrpcPort := int(filerPort) + 10000 - if optionalGrpcPort != 0 { - filerGrpcPort = optionalGrpcPort - } return fmt.Sprintf("%s:%d", hostnameAndPort[0], filerGrpcPort), nil } |