Update legacy peer CLI logging functions

This CR updates the descriptions and logging messages for
the legacy peer CLI logging functions to ensure they reflect
the new logging configuration.

FAB-12490 #done

Change-Id: I589a412206d9b8f1ad814bed2eeb6e4a172ec494
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

Author: wlahti

peer/clilogging/getlevel.go

@@ -1,17 +1,7 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-		 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package clilogging
@@ -32,7 +22,6 @@ func getLevelCmd(cf *LoggingCmdFactory) *cobra.Command {
 			return getLevel(cf, cmd, args)
 		},
 	}
-
 	return loggingGetLevelCmd
 }
 
@@ -60,7 +49,7 @@ func getLevel(cf *LoggingCmdFactory, cmd *cobra.Command, args []string) (err err
 		if err != nil {
 			return err
 		}
-		logger.Infof("Current log level for peer module '%s': %s", logResponse.LogModule, logResponse.LogLevel)
+		logger.Infof("Current log level for module '%s': %s", logResponse.LogModule, logResponse.LogLevel)
 	}
 	return err
 }

peer/clilogging/logging.go

@@ -16,7 +16,7 @@ import (
 
 const (
 	loggingFuncName = "logging"
-	loggingCmdDes   = "Log levels: getlevel|setlevel|revertlevels."
+	loggingCmdDes   = "Logging configuration: getlevel|setlevel|getlogspec|setlogspec|revertlevels."
 )
 
 var logger = flogging.MustGetLogger("cli.logging")

peer/clilogging/revertlevels.go

@@ -16,8 +16,8 @@ import (
 func revertLevelsCmd(cf *LoggingCmdFactory) *cobra.Command {
 	var loggingRevertLevelsCmd = &cobra.Command{
 		Use:   "revertlevels",
-		Short: "Reverts the logging levels to the levels at the end of peer startup.",
-		Long:  `Reverts the logging levels to the levels at the end of peer startup`,
+		Short: "Reverts the logging spec to the peer's spec at startup.",
+		Long:  `Reverts the logging spec to the peer's spec at startup.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return revertLevels(cf, cmd, args)
 		},
@@ -42,7 +42,7 @@ func revertLevels(cf *LoggingCmdFactory, cmd *cobra.Command, args []string) (err
 		if err != nil {
 			return err
 		}
-		logger.Info("Log levels reverted to the levels at the end of peer startup.")
+		logger.Info("Logging spec reverted to the peer's spec at startup.")
 	}
 	return err
 }

peer/clilogging/setlevel.go

@@ -15,9 +15,9 @@ import (
 
 func setLevelCmd(cf *LoggingCmdFactory) *cobra.Command {
 	var loggingSetLevelCmd = &cobra.Command{
-		Use:   "setlevel <module regular expression> <log level>",
-		Short: "Sets the logging level for all modules that match the regular expression.",
-		Long:  `Sets the logging level for all modules that match the regular expression.`,
+		Use:   "setlevel <module> <log level>",
+		Short: "Adds the module and log level to the current logging spec.",
+		Long:  `Adds the module and log level to the current logging specification.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return setLevel(cf, cmd, args)
 		},
@@ -50,7 +50,7 @@ func setLevel(cf *LoggingCmdFactory, cmd *cobra.Command, args []string) (err err
 		if err != nil {
 			return err
 		}
-		logger.Infof("Log level set for peer modules matching regular expression '%s': %s", logResponse.LogModule, logResponse.LogLevel)
+		logger.Infof("Log level set for module name/prefix '%s': %s", logResponse.LogModule, logResponse.LogLevel)
 	}
 	return err
 }