This commit is contained in:
Chris Lu 2019-10-25 07:45:12 -07:00
parent 288c45a690
commit 69de05f6cb
3 changed files with 3 additions and 7 deletions

View file

@ -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)

View file

@ -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 {

View file

@ -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