Clean up and improve chaincode log level messages

Change-Id: I249a9b169070b6a36a742a83f594f7843db4b433
Signed-off-by: Will Lahti <[email protected]>

Author: wlahti

core/chaincode/chaincode_support.go

@@ -172,7 +172,7 @@ func NewChaincodeSupport(chainname ChainName, getPeerEndpoint func() (*pb.PeerEn
 	if err == nil {
 		s.chaincodeLogLevel = chaincodeLogLevel.String()
 	} else {
-		chaincodeLogger.Infof("chaincode logging level %s is invalid. defaulting to %s\n", chaincodeLogLevelString, flogging.DefaultLoggingLevel().String())
+		chaincodeLogger.Warningf("Chaincode logging level %s is invalid; defaulting to %s", chaincodeLogLevelString, flogging.DefaultLoggingLevel().String())
 		s.chaincodeLogLevel = flogging.DefaultLoggingLevel().String()
 	}
 

core/chaincode/shim/chaincode.go

@@ -117,13 +117,18 @@ func SetChaincodeLoggingLevel() {
 	viper.SetEnvKeyReplacer(replacer)
 
 	chaincodeLogLevelString := viper.GetString("logging.chaincode")
-	chaincodeLogLevel, err := LogLevel(chaincodeLogLevelString)
-
-	if err == nil {
-		SetLoggingLevel(chaincodeLogLevel)
+	if chaincodeLogLevelString == "" {
+		shimLogLevelDefault := logging.Level(shimLoggingLevel)
+		chaincodeLogger.Infof("Chaincode log level not provided; defaulting to: %s", shimLogLevelDefault)
 	} else {
-		chaincodeLogger.Infof("error with chaincode log level: %s level= %s\n", err, chaincodeLogLevelString)
+		chaincodeLogLevel, err := LogLevel(chaincodeLogLevelString)
+		if err == nil {
+			SetLoggingLevel(chaincodeLogLevel)
+		} else {
+			chaincodeLogger.Warningf("Error: %s for chaincode log level: %s", err, chaincodeLogLevelString)
+		}
 	}
+
 }
 
 // StartInProc is an entry point for system chaincodes bootstrap. It is not an