From 922c614bdea87028d0e5a690b3e3b7f2d4675f11 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 21 Jul 2018 20:42:14 -0700 Subject: [PATCH] fix compilation problem --- weed/command/mount.go | 25 +++++++++++++++++++++++++ weed/command/mount_std.go | 21 --------------------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/weed/command/mount.go b/weed/command/mount.go index 8d026feac..d35723c15 100644 --- a/weed/command/mount.go +++ b/weed/command/mount.go @@ -1,5 +1,11 @@ package command +import ( + "strings" + "fmt" + "strconv" +) + type MountOptions struct { filer *string filerGrpcPort *int @@ -46,3 +52,22 @@ var cmdMount = &Command{ `, } + +func parseFilerGrpcAddress(filer string, optionalGrpcPort int) (filerGrpcAddress string, err error) { + hostnameAndPort := strings.Split(filer, ":") + if len(hostnameAndPort) != 2 { + return "", fmt.Errorf("The filer should have hostname:port format: %v", hostnameAndPort) + } + + filerPort, parseErr := strconv.ParseUint(hostnameAndPort[1], 10, 64) + if parseErr != nil { + return "", fmt.Errorf("The filer filer port parse error: %v", parseErr) + } + + filerGrpcPort := int(filerPort) + 10000 + if optionalGrpcPort != 0 { + filerGrpcPort = optionalGrpcPort + } + + return fmt.Sprintf("%s:%d", hostnameAndPort[0], filerGrpcPort), nil +} diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 242ed4dc8..4fb6a4465 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -11,8 +11,6 @@ import ( "github.com/chrislusf/seaweedfs/weed/filesys" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/util" - "strconv" - "strings" ) func runMount(cmd *Command, args []string) bool { @@ -74,22 +72,3 @@ func runMount(cmd *Command, args []string) bool { return true } - -func parseFilerGrpcAddress(filer string, optionalGrpcPort int) (filerGrpcAddress string, err error) { - hostnameAndPort := strings.Split(filer, ":") - if len(hostnameAndPort) != 2 { - return "", fmt.Errorf("The filer should have hostname:port format: %v", hostnameAndPort) - } - - filerPort, parseErr := strconv.ParseUint(hostnameAndPort[1], 10, 64) - if parseErr != nil { - return "", fmt.Errorf("The filer filer port parse error: %v", parseErr) - } - - filerGrpcPort := int(filerPort) + 10000 - if optionalGrpcPort != 0 { - filerGrpcPort = optionalGrpcPort - } - - return fmt.Sprintf("%s:%d", hostnameAndPort[0], filerGrpcPort), nil -}