Merge "Aligned logging in membersrvc with that in peer."

hyperledger · Aug 1, 2016 · 84431e3 · 84431e3
2 parents 2eb7b79 + 0ea65fd
commit 84431e3
Show file tree

Hide file tree

Showing 22 changed files with 242 additions and 255 deletions.
diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
@@ -18,7 +18,6 @@ package chaincode
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"strconv"
@@ -59,7 +58,6 @@ func initMemSrvc() (net.Listener, error) {
 	//start clean
 	finitMemSrvc(nil)
 
-	ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
 	ca.CacheConfiguration() // Cache configuration
 
 	aca := ca.NewACA()

diff --git a/core/crypto/crypto_test.go b/core/crypto/crypto_test.go
@@ -22,7 +22,6 @@ import (
 
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -436,7 +435,7 @@ func TestClientGetNextTCerts(t *testing.T) {
 	var nCerts int = 1
 	for i := 1; i < 3; i++ {
 		nCerts *= 10
-		fmt.Println(fmt.Sprintf("Calling GetNextTCerts(%d)", nCerts))
+		t.Logf("Calling GetNextTCerts(%d)", nCerts)
 		rvCerts, err := deployer.GetNextTCerts(nCerts)
 		if err != nil {
 			t.Fatalf("Could not receive %d TCerts", nCerts)
@@ -1524,7 +1523,6 @@ func setup() {
 }
 
 func initPKI() {
-	ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
 	ca.CacheConfiguration() // Need cache the configuration first
 	aca = ca.NewACA()
 	eca = ca.NewECA()
@@ -1567,21 +1565,18 @@ func initNodes() {
 	// Init clients
 	err := initClients()
 	if err != nil {
-		fmt.Printf("Failed initializing clients [%s]\n", err)
 		panic(fmt.Errorf("Failed initializing clients [%s].", err))
 	}
 
 	// Init peer
 	err = initPeers()
 	if err != nil {
-		fmt.Printf("Failed initializing peers [%s]\n", err)
 		panic(fmt.Errorf("Failed initializing peers [%s].", err))
 	}
 
 	// Init validators
 	err = initValidators()
 	if err != nil {
-		fmt.Printf("Failed initializing validators [%s]\n", err)
 		panic(fmt.Errorf("Failed initializing validators [%s].", err))
 	}
 

diff --git a/core/logging.go → flogging/logging.go b/core/logging.go → flogging/logging.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package core
+package flogging
 
 import (
 	"os"

diff --git a/core/logging_test.go → flogging/logging_test.go b/core/logging_test.go → flogging/logging_test.go
@@ -14,28 +14,29 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package core
+package flogging_test
 
 import (
 	"testing"
 
+	"github.com/hyperledger/fabric/flogging"
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 )
 
 func TestLoggingLevelDefault(t *testing.T) {
 	viper.Reset()
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
-	assertDefaultLoggingLevel(t, DefaultLoggingLevel())
+	assertDefaultLoggingLevel(t, flogging.DefaultLoggingLevel())
 }
 
 func TestLoggingLevelOtherThanDefault(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "warning")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
 	assertDefaultLoggingLevel(t, logging.WARNING)
 }
@@ -44,7 +45,7 @@ func TestLoggingLevelForSpecificModule(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "core=info")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
 	assertModuleLoggingLevel(t, "core", logging.INFO)
 }
@@ -53,7 +54,7 @@ func TestLoggingLeveltForMultipleModules(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "core=warning:test=debug")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
 	assertModuleLoggingLevel(t, "core", logging.WARNING)
 	assertModuleLoggingLevel(t, "test", logging.DEBUG)
@@ -63,7 +64,7 @@ func TestLoggingLevelForMultipleModulesAtSameLevel(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "core,test=warning")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
 	assertModuleLoggingLevel(t, "core", logging.WARNING)
 	assertModuleLoggingLevel(t, "test", logging.WARNING)
@@ -73,7 +74,7 @@ func TestLoggingLevelForModuleWithDefault(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "info:test=warning")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
 	assertDefaultLoggingLevel(t, logging.INFO)
 	assertModuleLoggingLevel(t, "test", logging.WARNING)
@@ -83,7 +84,7 @@ func TestLoggingLevelForModuleWithDefaultAtEnd(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "test=warning:info")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
 	assertDefaultLoggingLevel(t, logging.INFO)
 	assertModuleLoggingLevel(t, "test", logging.WARNING)
@@ -93,53 +94,53 @@ func TestLoggingLevelForSpecificCommand(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging.node", "error")
 
-	LoggingInit("node")
+	flogging.LoggingInit("node")
 
 	assertDefaultLoggingLevel(t, logging.ERROR)
 }
 
 func TestLoggingLevelForUnknownCommandGoesToDefault(t *testing.T) {
 	viper.Reset()
 
-	LoggingInit("unknown command")
+	flogging.LoggingInit("unknown command")
 
-	assertDefaultLoggingLevel(t, DefaultLoggingLevel())
+	assertDefaultLoggingLevel(t, flogging.DefaultLoggingLevel())
 }
 
 func TestLoggingLevelInvalid(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "invalidlevel")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
-	assertDefaultLoggingLevel(t, DefaultLoggingLevel())
+	assertDefaultLoggingLevel(t, flogging.DefaultLoggingLevel())
 }
 
 func TestLoggingLevelInvalidModules(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "core=invalid")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
-	assertDefaultLoggingLevel(t, DefaultLoggingLevel())
+	assertDefaultLoggingLevel(t, flogging.DefaultLoggingLevel())
 }
 
 func TestLoggingLevelInvalidEmptyModule(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "=warning")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
-	assertDefaultLoggingLevel(t, DefaultLoggingLevel())
+	assertDefaultLoggingLevel(t, flogging.DefaultLoggingLevel())
 }
 
 func TestLoggingLevelInvalidModuleSyntax(t *testing.T) {
 	viper.Reset()
 	viper.Set("logging_level", "type=warn=again")
 
-	LoggingInit("")
+	flogging.LoggingInit("")
 
-	assertDefaultLoggingLevel(t, DefaultLoggingLevel())
+	assertDefaultLoggingLevel(t, flogging.DefaultLoggingLevel())
 }
 
 func assertDefaultLoggingLevel(t *testing.T, expectedLevel logging.Level) {

diff --git a/membersrvc/ca/aca.go b/membersrvc/ca/aca.go
@@ -19,7 +19,6 @@ package ca
 import (
 	"encoding/asn1"
 	"errors"
-	"fmt"
 	"google/protobuf"
 	"strings"
 	"time"
@@ -28,12 +27,16 @@ import (
 
 	"database/sql"
 
+	"github.com/hyperledger/fabric/flogging"
+	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
 
 	pb "github.com/hyperledger/fabric/membersrvc/protos"
 )
 
+var acaLogger = logging.MustGetLogger("aca")
+
 var (
 	//ACAAttribute is the base OID to the attributes extensions.
 	ACAAttribute = asn1.ObjectIdentifier{1, 2, 3, 4, 5, 6, 10}
@@ -220,7 +223,7 @@ func (attrPair *AttributePair) ToACAAttribute() *pb.ACAAttribute {
 // NewACA sets up a new ACA.
 func NewACA() *ACA {
 	aca := &ACA{CA: NewCA("aca", initializeACATables)}
-
+	flogging.LoggingInit("aca")
 	return aca
 }
 
@@ -263,12 +266,12 @@ func (aca *ACA) fetchAttributes(id, affiliation string) ([]*AttributePair, error
 				}
 				attributes = append(attributes, attrPair)
 			} else {
-				Error.Printf("Invalid attribute entry '%v'", vals[0])
+				acaLogger.Errorf("Invalid attribute entry '%v'", vals[0])
 			}
 		}
 	}
 
-	fmt.Printf("%v %v", id, attributes)
+	acaLogger.Debugf("%v %v", id, attributes)
 
 	return attributes, nil
 }
@@ -365,28 +368,28 @@ func (aca *ACA) findAttribute(owner *AttributeOwner, attributeName string) (*Att
 
 func (aca *ACA) startACAP(srv *grpc.Server) {
 	pb.RegisterACAPServer(srv, &ACAP{aca})
-	Info.Println("ACA PUBLIC gRPC API server started")
+	acaLogger.Info("ACA PUBLIC gRPC API server started")
 }
 
 // Start starts the ACA.
 func (aca *ACA) Start(srv *grpc.Server) {
-	Info.Println("Staring ACA services...")
+	acaLogger.Info("Staring ACA services...")
 	aca.startACAP(srv)
 	aca.gRPCServer = srv
-	Info.Println("ACA services started")
+	acaLogger.Info("ACA services started")
 }
 
 // Stop stops the ACA
 func (aca *ACA) Stop() error {
-	Info.Println("Stopping the ACA services...")
+	acaLogger.Info("Stopping the ACA services...")
 	if aca.gRPCServer != nil {
 		aca.gRPCServer.Stop()
 	}
 	err := aca.CA.Stop()
 	if err != nil {
-		Error.Println("Error stopping the ACA services ", err)
+		acaLogger.Errorf("Error stopping the ACA services: %s ", err)
 	} else {
-		Info.Println("ACA services stopped")
+		acaLogger.Info("ACA services stopped")
 	}
 	return err
 }
diff --git a/membersrvc/ca/acap.go b/membersrvc/ca/acap.go
@@ -26,12 +26,15 @@ import (
 	"crypto/x509/pkix"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/op/go-logging"
 	"golang.org/x/net/context"
 
 	"github.com/hyperledger/fabric/core/crypto/primitives"
 	pb "github.com/hyperledger/fabric/membersrvc/protos"
 )
 
+var acapLogger = logging.MustGetLogger("acap")
+
 // ACAP serves the public GRPC interface of the ACA.
 //
 type ACAP struct {
@@ -40,7 +43,7 @@ type ACAP struct {
 
 // FetchAttributes fetchs the attributes from the outside world and populate them into the database.
 func (acap *ACAP) FetchAttributes(ctx context.Context, in *pb.ACAFetchAttrReq) (*pb.ACAFetchAttrResp, error) {
-	Trace.Println("grpc ACAP:FetchAttributes")
+	acapLogger.Debug("grpc ACAP:FetchAttributes")
 
 	if in.Ts == nil || in.ECert == nil || in.Signature == nil {
 		return &pb.ACAFetchAttrResp{Status: pb.ACAFetchAttrResp_FAILURE, Msg: "Bad request"}, nil
@@ -107,7 +110,7 @@ func (acap *ACAP) createRequestAttributeResponse(status pb.ACAAttrResp_StatusCod
 
 // RequestAttributes lookups the atributes in the database and return a certificate with attributes included in the request and found in the database.
 func (acap *ACAP) RequestAttributes(ctx context.Context, in *pb.ACAAttrReq) (*pb.ACAAttrResp, error) {
-	Trace.Println("grpc ACAP:RequestAttributes")
+	acapLogger.Debug("grpc ACAP:RequestAttributes")
 
 	fail := pb.ACAAttrResp_FULL_SUCCESSFUL // else explicit which-param-failed error
 	if nil == in.Ts {
@@ -225,7 +228,7 @@ func (acap *ACAP) addAttributesToExtensions(attributes *[]AttributePair, extensi
 // ReadCACertificate reads the certificate of the ACA.
 //
 func (acap *ACAP) ReadCACertificate(ctx context.Context, in *pb.Empty) (*pb.Cert, error) {
-	Trace.Println("grpc ACAP:ReadCACertificate")
+	acapLogger.Debug("grpc ACAP:ReadCACertificate")
 
 	return &pb.Cert{Cert: acap.aca.raw}, nil
 }