Fix the sugared logger usage (#300)

* Fix the sugared logger usage

Without `w` the logged messages are quite useless and annoying.

* some more magic
This commit is contained in:
Victor Agababov 2019-02-28 18:17:38 -08:00 committed by Knative Prow Robot
parent 23907fa727
commit c100323403
6 changed files with 16 additions and 16 deletions

View File

@ -114,7 +114,7 @@ func NewImpl(r Reconciler, logger *zap.SugaredLogger, workQueueName string, repo
func (c *Impl) Enqueue(obj interface{}) {
key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
if err != nil {
c.logger.Error(zap.Error(err))
c.logger.Errorw("Enqueue", zap.Error(err))
return
}
c.EnqueueKey(key)
@ -258,7 +258,7 @@ func (c *Impl) processNextWorkItem() bool {
if err != nil {
status = falseString
}
c.statsReporter.ReportReconcile(time.Now().Sub(startTime), key, status)
c.statsReporter.ReportReconcile(time.Since(startTime), key, status)
}()
// Embed the key into the logger and attach that to the context we pass
@ -270,20 +270,20 @@ func (c *Impl) processNextWorkItem() bool {
// resource to be synced.
if err = c.Reconciler.Reconcile(ctx, key); err != nil {
c.handleErr(err, key)
logger.Errorf("Reconcile failed. Time taken: %v.", time.Now().Sub(startTime))
logger.Infof("Reconcile failed. Time taken: %v.", time.Since(startTime))
return true
}
// Finally, if no error occurs we Forget this item so it does not
// have any delay when another change happens.
c.WorkQueue.Forget(key)
logger.Infof("Reconcile succeeded. Time taken: %v.", time.Now().Sub(startTime))
logger.Infof("Reconcile succeeded. Time taken: %v.", time.Since(startTime))
return true
}
func (c *Impl) handleErr(err error, key string) {
c.logger.Error(zap.Error(err))
c.logger.Errorw("Reconcile error", zap.Error(err))
// Re-queue the key if it's an transient error.
if !IsPermanentError(err) {

View File

@ -173,7 +173,7 @@ func UpdateLevelFromConfigMap(logger *zap.SugaredLogger, atomicLevel zap.AtomicL
return func(configMap *corev1.ConfigMap) {
loggingConfig, err := NewConfigFromConfigMap(configMap, components...)
if err != nil {
logger.Error("Failed to parse the logging configmap. Previous config map will be used.", zap.Error(err))
logger.Errorw("Failed to parse the logging configmap. Previous config map will be used.", zap.Error(err))
return
}

View File

@ -127,9 +127,9 @@ func UpdateExporterFromConfigMap(domain string, component string, logger *zap.Su
if err != nil {
if ce := getCurMetricsExporter(); ce == nil {
// Fail the process if there doesn't exist an exporter.
logger.Error("Failed to get a valid metrics config", zap.Error(err))
logger.Errorw("Failed to get a valid metrics config", zap.Error(err))
} else {
logger.Error("Failed to get a valid metrics config; Skip updating the metrics exporter", zap.Error(err))
logger.Errorw("Failed to get a valid metrics config; Skip updating the metrics exporter", zap.Error(err))
}
return
}

View File

@ -30,7 +30,7 @@ var (
func newPrometheusExporter(config *metricsConfig, logger *zap.SugaredLogger) (view.Exporter, error) {
e, err := prometheus.NewExporter(prometheus.Options{Namespace: config.component})
if err != nil {
logger.Error("Failed to create the Prometheus exporter.", zap.Error(err))
logger.Errorw("Failed to create the Prometheus exporter.", zap.Error(err))
return nil, err
}
logger.Infof("Created Opencensus Prometheus exporter with config: %v. Start the server for Prometheus exporter.", config)

View File

@ -53,7 +53,7 @@ func newStackdriverExporter(config *metricsConfig, logger *zap.SugaredLogger) (v
DefaultMonitoringLabels: &stackdriver.Labels{},
})
if err != nil {
logger.Error("Failed to create the Stackdriver exporter: ", zap.Error(err))
logger.Errorw("Failed to create the Stackdriver exporter: ", zap.Error(err))
return nil, err
}
logger.Infof("Created Opencensus Stackdriver exporter with config %v", config)

View File

@ -110,19 +110,19 @@ func createCA(ctx context.Context, name, namespace string) (*rsa.PrivateKey, *x5
logger := logging.FromContext(ctx)
rootKey, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
logger.Error("error generating random key", zap.Error(err))
logger.Errorw("error generating random key", zap.Error(err))
return nil, nil, nil, err
}
rootCertTmpl, err := createCACertTemplate(name, namespace)
if err != nil {
logger.Error("error generating CA cert", zap.Error(err))
logger.Errorw("error generating CA cert", zap.Error(err))
return nil, nil, nil, err
}
rootCert, rootCertPEM, err := createCert(rootCertTmpl, rootCertTmpl, &rootKey.PublicKey, rootKey)
if err != nil {
logger.Error("error signing the CA cert", zap.Error(err))
logger.Errorw("error signing the CA cert", zap.Error(err))
return nil, nil, nil, err
}
return rootKey, rootCert, rootCertPEM, nil
@ -143,19 +143,19 @@ func CreateCerts(ctx context.Context, name, namespace string) (serverKey, server
// Then create the private key for the serving cert
servKey, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
logger.Error("error generating random key", zap.Error(err))
logger.Errorw("error generating random key", zap.Error(err))
return nil, nil, nil, err
}
servCertTemplate, err := createServerCertTemplate(name, namespace)
if err != nil {
logger.Error("failed to create the server certificate template", zap.Error(err))
logger.Errorw("failed to create the server certificate template", zap.Error(err))
return nil, nil, nil, err
}
// create a certificate which wraps the server's public key, sign it with the CA private key
_, servCertPEM, err := createCert(servCertTemplate, caCertificate, &servKey.PublicKey, caKey)
if err != nil {
logger.Error("error signing server certificate template", zap.Error(err))
logger.Errorw("error signing server certificate template", zap.Error(err))
return nil, nil, nil, err
}
servKeyPEM := pem.EncodeToMemory(&pem.Block{