diff options
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/command/filer_copy.go | 1 | ||||
| -rw-r--r-- | weed/command/shell.go | 5 | ||||
| -rw-r--r-- | weed/shell/commands.go | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go index cc73549b4..9995cf6aa 100644 --- a/weed/command/filer_copy.go +++ b/weed/command/filer_copy.go @@ -400,7 +400,6 @@ func (worker *FileCopyWorker) uploadFileInChunks(ctx context.Context, task FileC wg.Wait() close(chunksChan) - var chunks []*filer_pb.FileChunk for chunk := range chunksChan { chunks = append(chunks, chunk) diff --git a/weed/command/shell.go b/weed/command/shell.go index 7f971c477..91aa8770a 100644 --- a/weed/command/shell.go +++ b/weed/command/shell.go @@ -13,9 +13,8 @@ import ( ) var ( - shellOptions shell.ShellOptions + shellOptions shell.ShellOptions shellInitialFilerUrl *string - ) func init() { @@ -32,13 +31,11 @@ var cmdShell = &Command{ `, } - func runShell(command *Command, args []string) bool { util.LoadConfiguration("security", false) shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("grpc"), "client") - var filerPwdErr error shellOptions.FilerHost, shellOptions.FilerPort, shellOptions.Directory, filerPwdErr = parseFilerUrl(*shellInitialFilerUrl) if filerPwdErr != nil { diff --git a/weed/shell/commands.go b/weed/shell/commands.go index 02f576011..b642ec253 100644 --- a/weed/shell/commands.go +++ b/weed/shell/commands.go @@ -16,8 +16,8 @@ import ( ) type ShellOptions struct { - Masters *string - GrpcDialOption grpc.DialOption + Masters *string + GrpcDialOption grpc.DialOption // shell transient context FilerHost string FilerPort int64 |