aboutsummaryrefslogtreecommitdiff
path: root/weed/command
diff options
context:
space:
mode:
Diffstat (limited to 'weed/command')
-rw-r--r--weed/command/scaffold.go2
-rw-r--r--weed/command/shell.go24
2 files changed, 3 insertions, 23 deletions
diff --git a/weed/command/scaffold.go b/weed/command/scaffold.go
index 6fa72c730..76b244a05 100644
--- a/weed/command/scaffold.go
+++ b/weed/command/scaffold.go
@@ -346,6 +346,8 @@ scripts = """
"""
sleep_minutes = 17 # sleep minutes between each script execution
+filer_url = "http://localhost:8888/"
+
sequencer_type = memory # Choose [memory|etcd] type for storing the file id sequence
# when sequencer.type = etcd, set listen client urls of etcd cluster that store file id sequence
diff --git a/weed/command/shell.go b/weed/command/shell.go
index 91aa8770a..34b5aef31 100644
--- a/weed/command/shell.go
+++ b/weed/command/shell.go
@@ -2,9 +2,6 @@ package command
import (
"fmt"
- "net/url"
- "strconv"
- "strings"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/shell"
@@ -37,7 +34,7 @@ func runShell(command *Command, args []string) bool {
shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("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 +45,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
-}