Merge pull request #385 from xenophenes/develop

issue #367

Author: Jeff McCormick

apiserver/clusterservice/clusterservice.go

@@ -88,7 +88,7 @@ func ShowClusterHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	ccpimagetag := r.URL.Query().Get("ccpimagetag")
 	if ccpimagetag != "" {
-		log.Debug("ccpimagetag param was [" + ccpimagetag + "]")
+		log.Debugf("ccpimagetag parameter is [%s]", ccpimagetag)
 	}
 	clientVersion := r.URL.Query().Get("version")
 	if clientVersion != "" {
@@ -155,7 +155,7 @@ func DeleteClusterHandler(w http.ResponseWriter, r *http.Request) {
 	deleteConfigs := false
 	deleteConfigsStr := r.URL.Query().Get("delete-configs")
 	if deleteDataStr != "" {
-		log.Debug("delete-configs param was [" + deleteConfigsStr + "]")
+		log.Debugf("delete-configs parameter is [%s]", deleteConfigsStr)
 		deleteConfigs, _ = strconv.ParseBool(deleteConfigsStr)
 	}
 

apiserver/pvcservice/pvcimpl.go

@@ -62,7 +62,7 @@ func ShowPVC(pvcName, PVCRoot string) ([]string, error) {
 		return pvcList, err
 	}
 
-	log.Debug("\nPVC %s\n", pvc.Name+" is found")
+	log.Debugf("\nPVC %s\n is found", pvc.Name)
 	pvcList, err = printPVCListing(pvc.ObjectMeta.Labels[util.LABEL_PG_CLUSTER], pvc.Name, PVCRoot)
 
 	return pvcList, err
@@ -84,7 +84,7 @@ func printPVCListing(clusterName, pvcName, PVCRoot string) ([]string, error) {
 		log.Error(err.Error())
 		return newlines, err
 	} else {
-		log.Debug("deleting prior pod " + podName)
+		log.Debugf("deleting prior pod %s", podName)
 		err = kubeapi.DeletePod(apiserver.Clientset, podName, apiserver.Namespace)
 		if err != nil {
 			return newlines, err
@@ -101,9 +101,9 @@ func printPVCListing(clusterName, pvcName, PVCRoot string) ([]string, error) {
 
 	pvcRoot := "/"
 	if PVCRoot != "" {
-		log.Debug("using " + PVCRoot + " as the PVC listing root")
+		log.Debugf("using %s as the PVC listing root", PVCRoot)
 		pvcRoot = PVCRoot
-		log.Debug(pvcName + "/" + pvcRoot)
+		log.Debugf("%s/%s", pvcName, pvcRoot)
 	} else {
 		log.Debug(pvcName)
 	}
@@ -152,9 +152,9 @@ func printPVCListing(clusterName, pvcName, PVCRoot string) ([]string, error) {
 	logOptions := v1.PodLogOptions{}
 	req := apiserver.Clientset.CoreV1().Pods(apiserver.Namespace).GetLogs(podName, &logOptions)
 	if req == nil {
-		log.Debug("error in get logs for " + podName)
+		log.Debugf("error in get logs for %s", podName)
 	} else {
-		log.Debug("got the logs for " + podName)
+		log.Debugf("got the logs for %s", podName)
 	}
 	readCloser, err := req.Stream()
 	if err != nil {
@@ -171,7 +171,7 @@ func printPVCListing(clusterName, pvcName, PVCRoot string) ([]string, error) {
 	_, err = io.Copy(&buf2, readCloser)
 	log.Debugf("backups are... \n%s", buf2.String())
 
-	log.Debug("pvc=" + pvcName)
+	log.Debugf("pvc = %s", pvcName)
 	lines := strings.Split(buf2.String(), "\n")
 	//chop off last line since its only a newline
 	last := len(lines) - 1

apiserver/pvcservice/pvcservice.go

@@ -35,12 +35,12 @@ func ShowPVCHandler(w http.ResponseWriter, r *http.Request) {
 
 	pvcroot := r.URL.Query().Get("pvcroot")
 	if pvcroot != "" {
-		log.Debug("pvcroot param was [" + pvcroot + "]")
+		log.Debugf("pvcroot parameter is [%s]", pvcroot)
 	}
 
 	clientVersion := r.URL.Query().Get("version")
 	if clientVersion != "" {
-		log.Debug("version param was [" + clientVersion + "]")
+		log.Debugf("version parameter is [%s]", clientVersion)
 	}
 
 	switch r.Method {

apiserver/reloadservice/reloadimpl.go

@@ -66,7 +66,7 @@ func Reload(request *msgs.ReloadRequest) msgs.ReloadResponse {
 	}
 
 	for _, arg := range request.Args {
-		log.Debug("reload called for " + arg)
+		log.Debugf("reload called for %s", arg)
 
 		cluster := crv1.Pgcluster{}
 		found, err := kubeapi.Getpgcluster(apiserver.RESTClient, &cluster, arg, apiserver.Namespace)
@@ -120,7 +120,7 @@ func reload(
 	command := make([]string, 1)
 	command[0] = "/opt/cpm/bin/reload.sh"
 
-	log.Debug("running Exec with namespace=[" + namespace + "] podname=[" + pod.Name + "] container name=[" + pod.Spec.Containers[0].Name + "]")
+	log.Debugf("running Exec with namespace=[%s] podname=[%s] container name=[%s]", namespace, pod.Name, pod.Spec.Containers[0].Name)
 	stdout, stderr, err := kubeapi.ExecToPodThroughAPI(restconfig, apiserver.Clientset, command, pod.Spec.Containers[0].Name, pod.Name, apiserver.Namespace, nil)
 	if err != nil {
 		log.Error(err)