Skip to content

Commit

Permalink
[FAB-6270] cleaning up logger info,error,warning
Browse files Browse the repository at this point in the history
Change-Id: Icc1398659504e895ace67661be335ee26304dade
Signed-off-by: Sudesh Shetty <sudesh.shetty@securekey.com>
  • Loading branch information
sudeshrshetty committed Sep 25, 2017
1 parent 9cde6ca commit e58cbee
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion pkg/config/config.go
Expand Up @@ -63,7 +63,7 @@ func InitConfigWithCmdRoot(configFile string, cmdRootPrefix string) (*Config, er
err := myViper.ReadInConfig()

if err == nil {
logger.Infof("Using config file: %s", myViper.ConfigFileUsed())
logger.Debugf("Using config file: %s", myViper.ConfigFileUsed())
} else {
return nil, fmt.Errorf("Fatal error config file: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config_test.go
Expand Up @@ -362,7 +362,7 @@ func TestOrdererConfig(t *testing.T) {
t.Fatal("Expected GOPATH relative path to be replaced")
}
} else if orderers[0].TlsCACerts.Pem == "" {
t.Fatalf("Orderer %s must have at least a TlsCACerts.Path or TlsCACerts.Pem set", orderers[0])
t.Fatalf("Orderer %v must have at least a TlsCACerts.Path or TlsCACerts.Pem set", orderers[0])
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/fabric-ca-client/fabricca.go
Expand Up @@ -131,7 +131,7 @@ func (fabricCAServices *FabricCA) Reenroll(user sdkApi.User) (bccsp.Key, []byte,
// Create signing identity
identity, err := fabricCAServices.createSigningIdentity(user)
if err != nil {
logger.Infof("Invalid re-enroll request, %s is not a valid user %s\n", user.Name(), err)
logger.Debugf("Invalid re-enroll request, %s is not a valid user %s\n", user.Name(), err)
return nil, nil, fmt.Errorf("Reenroll has failed; Cannot create user identity: %s", err)
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/fabric-client/channel/channel.go
Expand Up @@ -53,7 +53,8 @@ func NewChannel(name string, client fab.FabricClient) (*Channel, error) {
o := make(map[string]fab.Orderer)
c := Channel{name: name, peers: p,
orderers: o, clientContext: client, mspManager: msp.NewMSPManager()}
logger.Infof("Constructed channel instance: %v", c)
logger.Infof("Constructed channel instance for channel %s", c.name)
logger.Debugf("Constructed channel instance: %V", c)

return &c, nil
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/fabric-client/channel/config.go
Expand Up @@ -301,9 +301,9 @@ func loadConfigGroup(configItems *configItems, versionsGroup *common.ConfigGroup
}

func loadConfigValue(configItems *configItems, key string, versionsValue *common.ConfigValue, configValue *common.ConfigValue, groupName string, org string) error {
logger.Infof("loadConfigValue - %s - START value name: %s", groupName, key)
logger.Infof("loadConfigValue - %s - version: %d", groupName, configValue.Version)
logger.Infof("loadConfigValue - %s - modPolicy: %s", groupName, configValue.ModPolicy)
logger.Debugf("loadConfigValue - %s - START value name: %s", groupName, key)
logger.Debugf("loadConfigValue - %s - version: %d", groupName, configValue.Version)
logger.Debugf("loadConfigValue - %s - modPolicy: %s", groupName, configValue.ModPolicy)

versionsValue.Version = configValue.Version

Expand Down
6 changes: 3 additions & 3 deletions pkg/fabric-client/events/eventhub.go
Expand Up @@ -393,21 +393,21 @@ func (eventHub *EventHub) txCallback(block *common.Block) {
for i, v := range block.Data.Data {

if env, err := utils.GetEnvelopeFromBlock(v); err != nil {
logger.Errorf("error extracting Envelope from block: %v\n", err)
logger.Debugf("error extracting Envelope from block: %v\n", err)
return
} else if env != nil {
// get the payload from the envelope
payload, err := utils.GetPayload(env)
if err != nil {
logger.Errorf("error extracting Payload from envelope: %v\n", err)
logger.Debugf("error extracting Payload from envelope: %v\n", err)
return
}

channelHeaderBytes := payload.Header.ChannelHeader
channelHeader := &common.ChannelHeader{}
err = proto.Unmarshal(channelHeaderBytes, channelHeader)
if err != nil {
logger.Errorf("error extracting ChannelHeader from payload: %v\n", err)
logger.Debugf("error extracting ChannelHeader from payload: %v\n", err)
return
}
callback := eventHub.getTXRegistrant(channelHeader.TxId)
Expand Down
5 changes: 2 additions & 3 deletions pkg/fabric-client/keyvaluestore/filekeyvaluestore.go
Expand Up @@ -12,9 +12,8 @@ import (
"os"
"path"

"github.com/op/go-logging"

utils "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/utils"
logging "github.com/op/go-logging"
)

var logger = logging.MustGetLogger("fabric_sdk_go")
Expand Down Expand Up @@ -66,7 +65,7 @@ func (fkvs *FileKeyValueStore) SetValue(key string, value []byte) error {
// createDirIfNotExists
func createDirIfNotExists(path string) error {
missing, err := utils.DirMissingOrEmpty(path)
logger.Infof("KeyStore path [%s] missing [%t]: [%s]", path, missing, err)
logger.Debugf("KeyStore path [%s] missing [%t]: [%s]", path, missing, err)

if missing {
os.MkdirAll(path, 0755)
Expand Down

0 comments on commit e58cbee

Please sign in to comment.