Merge pull request #1 from chrislusf/master

update from chrisluf 

1 files changed, 2 insertions, 25 deletions

diff --git a/weed/command/shell.go b/weed/command/shell.go
index 91aa8770a..dcf70608f 100644
--- a/weed/command/shell.go
+++ b/weed/command/shell.go
@@ -2,14 +2,10 @@ package command
 
 import (
 	"fmt"
-	"net/url"
-	"strconv"
-	"strings"
 
 	"github.com/chrislusf/seaweedfs/weed/security"
 	"github.com/chrislusf/seaweedfs/weed/shell"
 	"github.com/chrislusf/seaweedfs/weed/util"
-	"github.com/spf13/viper"
 )
 
 var (
@@ -34,10 +30,10 @@ var cmdShell = &Command{
 func runShell(command *Command, args []string) bool {
 
 	util.LoadConfiguration("security", false)
-	shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("grpc"), "client")
+	shellOptions.GrpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client")
 
 	var filerPwdErr error
-	shellOptions.FilerHost, shellOptions.FilerPort, shellOptions.Directory, filerPwdErr = parseFilerUrl(*shellInitialFilerUrl)
+	shellOptions.FilerHost, shellOptions.FilerPort, shellOptions.Directory, filerPwdErr = util.ParseFilerUrl(*shellInitialFilerUrl)
 	if filerPwdErr != nil {
 		fmt.Printf("failed to parse url filer.url=%s : %v\n", *shellInitialFilerUrl, filerPwdErr)
 		return false
@@ -48,22 +44,3 @@ func runShell(command *Command, args []string) bool {
 	return true
 
 }
-
-func parseFilerUrl(entryPath string) (filerServer string, filerPort int64, path string, err error) {
-	if !strings.HasPrefix(entryPath, "http://") && !strings.HasPrefix(entryPath, "https://") {
-		entryPath = "http://" + entryPath
-	}
-
-	var u *url.URL
-	u, err = url.Parse(entryPath)
-	if err != nil {
-		return
-	}
-	filerServer = u.Hostname()
-	portString := u.Port()
-	if portString != "" {
-		filerPort, err = strconv.ParseInt(portString, 10, 32)
-	}
-	path = u.Path
-	return
-}