Merge pull request #15 from humingcheng/master

Adapt to paas-lager

Author: wangkirin

csemonitor.go

@@ -84,7 +84,7 @@ func (reporter *Reporter) Run() {
 				if err != nil {
 					//If the connection fails for the first time then print Warn Logs
 					if IsMonitoringConnected {
-						lager.Logger.Warnf(err, "Unable to connect to monitoring server")
+						lager.Logger.Warnf("Unable to connect to monitoring server, err: %v", err)
 					}
 					IsMonitoringConnected = false
 				} else {

register.go

@@ -20,7 +20,7 @@ func reportMetricsToCSEDashboard(r metrics.Registry) error {
 
 	monitorServerURL, err := getMonitorEndpoint()
 	if err != nil {
-		lager.Logger.Warn("Get Monitoring URL failed, CSE monitoring function disabled", err)
+		lager.Logger.Warnf("Get Monitoring URL failed, CSE monitoring function disabled, err: %v", err)
 		return nil
 	}
 

utils.go

@@ -41,7 +41,7 @@ func getTLSForClient(monitorURL string) (*tls.Config, error) {
 		}
 		return nil, err
 	}
-	lager.Logger.Warnf(nil, "%s TLS mode, verify peer: %t, cipher plugin: %s",
+	lager.Logger.Warnf("%s TLS mode, verify peer: %t, cipher plugin: %s",
 		sslTag, sslConfig.VerifyPeer, sslConfig.CipherPlugin)
 
 	return tlsConfig, nil
@@ -70,7 +70,7 @@ func getMonitorEndpoint() (string, error) {
 	if monitorEndpoint == "" {
 		monitorURL, err := endpoint.GetEndpointFromServiceCenter("default", "CseMonitoring", "latest")
 		if err != nil {
-			lager.Logger.Warn("empty monitor server endpoint, please provide the monitor server endpoint", err)
+			lager.Logger.Warnf("empty monitor server endpoint, please provide the monitor server endpoint, err: %v", err)
 			return "", err
 		}