gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

go fmt

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
weed/command/filer_copy.go
View file

@ -400,7 +400,6 @@ func (worker *FileCopyWorker) uploadFileInChunks(ctx context.Context, task FileC
wg.Wait() wg.Wait()
close(chunksChan) close(chunksChan)
var chunks []*filer_pb.FileChunk var chunks []*filer_pb.FileChunk
for chunk := range chunksChan { for chunk := range chunksChan {
chunks = append(chunks, chunk) chunks = append(chunks, chunk)

5
weed/command/shell.go
View file

@ -13,9 +13,8 @@ import (
) )
var ( var (
shellOptions shell.ShellOptions shellOptions shell.ShellOptions
shellInitialFilerUrl *string shellInitialFilerUrl *string
) )
func init() { func init() {
@ -32,13 +31,11 @@ var cmdShell = &Command{
`, `,
} }
func runShell(command *Command, args []string) bool { func runShell(command *Command, args []string) bool {
util.LoadConfiguration("security", false) util.LoadConfiguration("security", false)
shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("grpc"), "client") shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("grpc"), "client")
var filerPwdErr error var filerPwdErr error
shellOptions.FilerHost, shellOptions.FilerPort, shellOptions.Directory, filerPwdErr = parseFilerUrl(*shellInitialFilerUrl) shellOptions.FilerHost, shellOptions.FilerPort, shellOptions.Directory, filerPwdErr = parseFilerUrl(*shellInitialFilerUrl)
if filerPwdErr != nil { if filerPwdErr != nil {

4
weed/shell/commands.go
View file

@ -16,8 +16,8 @@ import (
) )
type ShellOptions struct { type ShellOptions struct {
Masters *string Masters *string
GrpcDialOption grpc.DialOption GrpcDialOption grpc.DialOption
// shell transient context // shell transient context
FilerHost string FilerHost string
FilerPort int64 FilerPort int64