refactoring

weed/pb/shared_values.go

@@ -0,0 +1,5 @@
+package pb
+
+const (
+	AdminShellClient = "shell"
+)

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)

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,
 	}
 }