diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-04-12 20:48:21 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-04-12 20:48:21 -0700 |
| commit | 8e23dc078b6790ace902c09ed71963c9ce49acdb (patch) | |
| tree | fe7a659657a9a21eeba9dcb862182b05b16154c6 /weed | |
| parent | b062393f3f90388ac98706ed22bd20907015b265 (diff) | |
| download | seaweedfs-8e23dc078b6790ace902c09ed71963c9ce49acdb.tar.xz seaweedfs-8e23dc078b6790ace902c09ed71963c9ce49acdb.zip | |
refactoring
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/pb/shared_values.go | 5 | ||||
| -rw-r--r-- | weed/server/master_grpc_server.go | 6 | ||||
| -rw-r--r-- | weed/shell/commands.go | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/weed/pb/shared_values.go b/weed/pb/shared_values.go new file mode 100644 index 000000000..cac253ebb --- /dev/null +++ b/weed/pb/shared_values.go @@ -0,0 +1,5 @@ +package pb + +const ( + AdminShellClient = "shell" +)
\ No newline at end of file diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 1785a8ccb..a8da9ab2e 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -11,6 +11,7 @@ import ( "google.golang.org/grpc/peer" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/storage/backend" "github.com/chrislusf/seaweedfs/weed/storage/needle" @@ -191,8 +192,8 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ peerAddress := findClientAddress(stream.Context(), req.GrpcPort) // only one shell can be connected at any time - if req.Name == "shell" { - if ms.currentAdminShellClient == ""{ + if req.Name == pb.AdminShellClient { + if ms.currentAdminShellClient == "" { ms.currentAdminShellClient = peerAddress defer func() { ms.currentAdminShellClient = "" @@ -202,7 +203,6 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ } } - stopChan := make(chan bool) clientName, messageChan := ms.addClient(req.Name, peerAddress) diff --git a/weed/shell/commands.go b/weed/shell/commands.go index 41f197328..cbae6c03e 100644 --- a/weed/shell/commands.go +++ b/weed/shell/commands.go @@ -43,7 +43,7 @@ var ( func NewCommandEnv(options ShellOptions) *CommandEnv { return &CommandEnv{ env: make(map[string]string), - MasterClient: wdclient.NewMasterClient(options.GrpcDialOption, "shell", 0, strings.Split(*options.Masters, ",")), + MasterClient: wdclient.NewMasterClient(options.GrpcDialOption, pb.AdminShellClient, 0, strings.Split(*options.Masters, ",")), option: options, } } |