diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-03-23 22:54:02 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-03-23 22:54:02 -0700 |
| commit | 782d776d2a63c8c403f7fa52e97154f146467610 (patch) | |
| tree | 79390e2deb1e394ff19e6e1171bee653a3d44b90 | |
| parent | 38e73463f1c8c7d7dc226ea41679407cb66101d4 (diff) | |
| download | seaweedfs-782d776d2a63c8c403f7fa52e97154f146467610.tar.xz seaweedfs-782d776d2a63c8c403f7fa52e97154f146467610.zip | |
refactoring
| -rw-r--r-- | weed/shell/command_fs_du.go | 12 | ||||
| -rw-r--r-- | weed/shell/commands.go | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/weed/shell/command_fs_du.go b/weed/shell/command_fs_du.go index dc5c3dec0..08c553e7c 100644 --- a/weed/shell/command_fs_du.go +++ b/weed/shell/command_fs_du.go @@ -5,7 +5,6 @@ import ( "io" "github.com/chrislusf/seaweedfs/weed/filer2" - "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" ) @@ -82,14 +81,3 @@ func duTraverseDirectory(writer io.Writer, filerClient filer_pb.FilerClient, dir }) return } - -func (env *CommandEnv) WithFilerClient(fn func(filer_pb.SeaweedFilerClient) error) error { - - filerGrpcAddress := fmt.Sprintf("%s:%d", env.option.FilerHost, env.option.FilerPort+10000) - return pb.WithGrpcFilerClient(filerGrpcAddress, env.option.GrpcDialOption, fn) - -} - -func (env *CommandEnv) AdjustedUrl(hostAndPort string) string { - return hostAndPort -} diff --git a/weed/shell/commands.go b/weed/shell/commands.go index 6e40380e0..31136951e 100644 --- a/weed/shell/commands.go +++ b/weed/shell/commands.go @@ -10,6 +10,7 @@ import ( "google.golang.org/grpc" + "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/wdclient" @@ -79,6 +80,18 @@ func (ce *CommandEnv) checkDirectory(path string) error { } +func (ce *CommandEnv) WithFilerClient(fn func(filer_pb.SeaweedFilerClient) error) error { + + filerGrpcAddress := fmt.Sprintf("%s:%d", ce.option.FilerHost, ce.option.FilerPort+10000) + return pb.WithGrpcFilerClient(filerGrpcAddress, ce.option.GrpcDialOption, fn) + +} + +func (ce *CommandEnv) AdjustedUrl(hostAndPort string) string { + return hostAndPort +} + + func parseFilerUrl(entryPath string) (filerServer string, filerPort int64, path string, err error) { if strings.HasPrefix(entryPath, "http") { var u *url.URL |