switch to structured logging

fix gitlog func

update logging

update tests logging

update logging

update logging

switch to structured logging

fix gitlog func

update logging

update tests logging

update logging

update logging

switch to structured logging

fix gitlog func

update logging

update tests logging

update logging

update logging

Structured logging

Author: pinikomarov

controllers/glance_controller.go

@@ -64,7 +64,7 @@ type GlanceReconciler struct {
 	Scheme  *runtime.Scheme
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *GlanceReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("Glance")
 }
@@ -615,7 +615,10 @@ func (r *GlanceReconciler) reconcileNormal(ctx context.Context, instance *glance
 	}
 	if op != controllerutil.OperationResultNone {
 		Log.Info(fmt.Sprintf("Deployment %s successfully reconciled - operation: %s", instance.Name, string(op)))
+<<<<<<< HEAD
 		Log.Info(fmt.Sprintf("StatefulSet %s successfully reconciled - operation: %s", instance.Name, string(op)))
+=======
+>>>>>>> e82dc49 (switch to structured logging)
 	}
 
 	// It is possible that an earlier call to update the status has also set
@@ -646,7 +649,11 @@ func (r *GlanceReconciler) reconcileNormal(ctx context.Context, instance *glance
 		return ctrl.Result{}, err
 	}
 	if op != controllerutil.OperationResultNone {
+<<<<<<< HEAD
 		Log.Info(fmt.Sprintf("StatefulSet %s successfully reconciled - operation: %s", instance.Name, string(op)))
+=======
+		Log.Info(fmt.Sprintf("Deployment %s successfully reconciled - operation: %s", instance.Name, string(op)))
+>>>>>>> e82dc49 (switch to structured logging)
 	}
 
 	// Mirror external GlanceAPI status' APIEndpoints to this parent CR
@@ -761,6 +768,7 @@ func (r *GlanceReconciler) generateServiceConfig(
 	instance *glancev1.Glance,
 	envVars *map[string]env.Setter,
 ) error {
+	Log := r.GetLogger(ctx)
 	labels := labels.GetLabels(instance, labels.GetGroupLabel(glance.ServiceName), map[string]string{})
 
 	ospSecret, _, err := secret.GetSecret(ctx, h, instance.Spec.Secret, instance.Namespace)
@@ -781,11 +789,22 @@ func (r *GlanceReconciler) generateServiceConfig(
 	// We set in the main 00-config-default.conf the image-cache bits that will
 	// be used by CronJobs cleaner and pruner
 	if len(instance.Spec.ImageCacheSize) > 0 {
+<<<<<<< HEAD
 		// if ImageCacheSize is not a valid k8s Quantity, return an error
 		cacheSize, err := resource.ParseQuantity(instance.Spec.ImageCacheSize)
 		if err != nil {
 			return err
 		}
+=======
+		// catch any panic generated by the MustParse function and report an
+		// error
+		defer func() {
+			if err := recover(); err != nil {
+				Log.Error(err.(error), "ImageCacheSize not valid: %s")
+			}
+		}()
+		cacheSize := resource.MustParse(instance.Spec.ImageCacheSize)
+>>>>>>> e82dc49 (switch to structured logging)
 		templateParameters["CacheEnabled"] = true
 		templateParameters["CacheMaxSize"] = cacheSize.Value()
 		templateParameters["ImageCacheDir"] = glance.ImageCacheDir

controllers/glanceapi_controller.go

@@ -67,7 +67,11 @@ type GlanceAPIReconciler struct {
 	Scheme  *runtime.Scheme
 }
 
+<<<<<<< HEAD
 // getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+=======
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
+>>>>>>> e82dc49 (switch to structured logging)
 func (r *GlanceAPIReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("GlanceAPI")
 }