fluxcd
/
notification-controller
mirror of https://github.com/fluxcd/notification-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Normalise controller logs 

Change structure logging labels to match the controller runtime format
This commit is contained in:
stefanprodan 2020-07-15 16:02:11 +03:00
parent ba362287ac
commit 3112e18378
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/alert_controller.go
View File

@ -48,7 +48,7 @@ func (r *AlertReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
return ctrl.Result{}, client.IgnoreNotFound(err) return ctrl.Result{}, client.IgnoreNotFound(err)
} }
log := r.Log.WithValues(strings.ToLower(alert.Kind), req.NamespacedName) log := r.Log.WithValues("controller", strings.ToLower(alert.Kind), "request", req.NamespacedName)
init := true init := true
for _, condition := range alert.Status.Conditions { for _, condition := range alert.Status.Conditions {

2
controllers/provider_controller.go
View File

@ -48,7 +48,7 @@ func (r *ProviderReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
return ctrl.Result{}, client.IgnoreNotFound(err) return ctrl.Result{}, client.IgnoreNotFound(err)
} }
log := r.Log.WithValues(strings.ToLower(provider.Kind), req.NamespacedName) log := r.Log.WithValues("controller", strings.ToLower(provider.Kind), "request", req.NamespacedName)
init := true init := true
for _, condition := range provider.Status.Conditions { for _, condition := range provider.Status.Conditions {

4
controllers/receiver_controller.go
View File

@ -55,13 +55,12 @@ func (r *ReceiverReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
return ctrl.Result{}, client.IgnoreNotFound(err) return ctrl.Result{}, client.IgnoreNotFound(err)
} }
log := r.Log.WithValues(strings.ToLower(receiver.Kind), req.NamespacedName) log := r.Log.WithValues("controller", strings.ToLower(receiver.Kind), "request", req.NamespacedName)
token, err := r.token(ctx, receiver) token, err := r.token(ctx, receiver)
if err != nil { if err != nil {
receiver = v1alpha1.ReceiverNotReady(receiver, v1alpha1.TokenNotFoundReason, err.Error()) receiver = v1alpha1.ReceiverNotReady(receiver, v1alpha1.TokenNotFoundReason, err.Error())
if err := r.Status().Update(ctx, &receiver); err != nil { if err := r.Status().Update(ctx, &receiver); err != nil {
log.Error(err, "unable to update Receiver status")
return ctrl.Result{Requeue: true}, err return ctrl.Result{Requeue: true}, err
} }
} }
@ -85,7 +84,6 @@ func (r *ReceiverReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
"Receiver initialised with URL: "+receiverURL, "Receiver initialised with URL: "+receiverURL,
receiverURL) receiverURL)
if err := r.Status().Update(ctx, &receiver); err != nil { if err := r.Status().Update(ctx, &receiver); err != nil {
log.Error(err, "unable to update Receiver status")
return ctrl.Result{Requeue: true}, err return ctrl.Result{Requeue: true}, err
} }