Add common CLI function to get a server admin client

Change-Id: Idbe7cdcd56081f7d468a8f95c2335a4fb1d0efa9 Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
hyperledger · Dec 5, 2016 · 9baa4eb · 9baa4eb
1 parent 2dc82e0
commit 9baa4eb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 33 deletions.
diff --git a/peer/clilogging/getlevel.go b/peer/clilogging/getlevel.go
@@ -17,11 +17,9 @@ limitations under the License.
 package clilogging
 
 import (
-	"fmt"
-
-	"github.com/hyperledger/fabric/core/errors"
-	"github.com/hyperledger/fabric/core/peer"
+	"github.com/hyperledger/fabric/peer/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
+
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )
@@ -45,19 +43,13 @@ func getLevel(cmd *cobra.Command, args []string) (err error) {
 	if err != nil {
 		logger.Warningf("Error: %s", err)
 	} else {
-		clientConn, err := peer.NewPeerClientConnection()
+		adminClient, err := common.GetAdminClient()
 		if err != nil {
-			//logger.Infof("Error trying to connect to local peer: %s", err)
-			err = errors.ErrorWithCallstack(errors.Peer, errors.PeerConnectionError, err.Error())
-			logger.Infof("%s", err)
-			//err = fmt.Errorf("Error trying to connect to local peer: %s", err)
-			fmt.Println(&pb.ServerStatus{Status: pb.ServerStatus_UNKNOWN})
+			logger.Warningf("%s", err)
 			return err
 		}
 
-		serverClient := pb.NewAdminClient(clientConn)
-
-		logResponse, err := serverClient.GetModuleLogLevel(context.Background(), &pb.LogLevelRequest{LogModule: args[0]})
+		logResponse, err := adminClient.GetModuleLogLevel(context.Background(), &pb.LogLevelRequest{LogModule: args[0]})
 
 		if err != nil {
 			logger.Warningf("Error retrieving log level")

diff --git a/peer/clilogging/setlevel.go b/peer/clilogging/setlevel.go
@@ -17,13 +17,11 @@ limitations under the License.
 package clilogging
 
 import (
-	"fmt"
-
 	"golang.org/x/net/context"
 
-	"github.com/hyperledger/fabric/core/errors"
-	"github.com/hyperledger/fabric/core/peer"
+	"github.com/hyperledger/fabric/peer/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
+
 	"github.com/spf13/cobra"
 )
 
@@ -46,17 +44,13 @@ func setLevel(cmd *cobra.Command, args []string) (err error) {
 	if err != nil {
 		logger.Warningf("Error: %s", err)
 	} else {
-		clientConn, err := peer.NewPeerClientConnection()
+		adminClient, err := common.GetAdminClient()
 		if err != nil {
-			err = errors.ErrorWithCallstack(errors.Peer, errors.PeerConnectionError, err.Error())
 			logger.Warningf("%s", err)
-			fmt.Println(&pb.ServerStatus{Status: pb.ServerStatus_UNKNOWN})
 			return err
 		}
 
-		serverClient := pb.NewAdminClient(clientConn)
-
-		logResponse, err := serverClient.SetModuleLogLevel(context.Background(), &pb.LogLevelRequest{LogModule: args[0], LogLevel: args[1]})
+		logResponse, err := adminClient.SetModuleLogLevel(context.Background(), &pb.LogLevelRequest{LogModule: args[0], LogLevel: args[1]})
 
 		if err != nil {
 			logger.Warningf("%s", err)

diff --git a/peer/common/common.go b/peer/common/common.go
@@ -17,8 +17,7 @@ limitations under the License.
 package common
 
 import (
-	"fmt"
-
+	"github.com/hyperledger/fabric/core/errors"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/flogging"
 	pb "github.com/hyperledger/fabric/protos/peer"
@@ -33,12 +32,24 @@ const UndefinedParamValue = ""
 func GetEndorserClient(cmd *cobra.Command) (pb.EndorserClient, error) {
 	clientConn, err := peer.NewPeerClientConnection()
 	if err != nil {
-		return nil, fmt.Errorf("Error trying to connect to local peer: %s", err)
+		err = errors.ErrorWithCallstack(errors.Peer, errors.PeerConnectionError, err.Error())
+		return nil, err
 	}
 	endorserClient := pb.NewEndorserClient(clientConn)
 	return endorserClient, nil
 }
 
+// GetAdminClient returns a new admin client connection for this peer
+func GetAdminClient() (pb.AdminClient, error) {
+	clientConn, err := peer.NewPeerClientConnection()
+	if err != nil {
+		err = errors.ErrorWithCallstack(errors.Peer, errors.PeerConnectionError, err.Error())
+		return nil, err
+	}
+	adminClient := pb.NewAdminClient(clientConn)
+	return adminClient, nil
+}
+
 // SetErrorLoggingLevel sets the 'error' module's logger to the value in
 // core.yaml
 func SetErrorLoggingLevel() error {

diff --git a/peer/node/status.go b/peer/node/status.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/hyperledger/fabric/core/peer"
+	"github.com/hyperledger/fabric/peer/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
@@ -40,17 +40,15 @@ var nodeStatusCmd = &cobra.Command{
 }
 
 func status() (err error) {
-	clientConn, err := peer.NewPeerClientConnection()
+
+	adminClient, err := common.GetAdminClient()
 	if err != nil {
-		logger.Infof("Error trying to connect to local peer: %s", err)
-		err = fmt.Errorf("Error trying to connect to local peer: %s", err)
+		logger.Warningf("%s", err)
 		fmt.Println(&pb.ServerStatus{Status: pb.ServerStatus_UNKNOWN})
 		return err
 	}
 
-	serverClient := pb.NewAdminClient(clientConn)
-
-	status, err := serverClient.GetStatus(context.Background(), &empty.Empty{})
+	status, err := adminClient.GetStatus(context.Background(), &empty.Empty{})
 	if err != nil {
 		logger.Infof("Error trying to get status from local peer: %s", err)
 		err = fmt.Errorf("Error trying to connect to local peer: %s", err)