From 3e45d8d3807a2c6990b0c521c967664349297d69 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 5 Jan 2024 13:59:16 +0100
Subject: [PATCH] OZG-4453 adjust logging format
---
.../operator/keycloak/client/KeycloakClientReconciler.java | 3 +--
.../operator/keycloak/group/KeycloakGroupReconciler.java | 3 +--
.../operator/keycloak/realm/KeycloakRealmReconciler.java | 5 ++---
.../operator/keycloak/user/KeycloakUserReconciler.java | 6 +++---
.../ozgcloud/operator/keycloak/user/UserSecretReader.java | 2 +-
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
index 72db3ce..5c7c8a7 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
@@ -61,8 +61,7 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
return buildStatusOk(resource);
} catch (Exception e) {
- LOG.error("Could not reconcile client {} in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
- e.getStackTrace());
+ LOG.error("Could not reconcile client " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace(), e);
resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
index ce91397..c2c483d 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
@@ -60,8 +60,7 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup
return buildStatusOk(resource);
} catch (Exception e) {
- LOG.warn("Could not reconcile group {} in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
- e.getStackTrace());
+ LOG.warn("Could not reconcile group " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace(), e);
resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
index 183120c..6b9ad27 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
@@ -58,8 +58,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
return UpdateControl.updateStatus(resource);
} catch (Exception e) {
- LOG.warn("Could not reconcile realm {} in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
- e.getStackTrace());
+ LOG.warn("Could not reconcile realm " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace(), e);
resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
@@ -81,7 +80,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
service.deleteRealm(realmName);
return DeleteControl.defaultDelete();
} catch (Exception e) {
- LOG.warn("Could not delete KeycloakRealm {}: {}.", realmName, e.getStackTrace());
+ LOG.warn("Could not delete KeycloakRealm " + realmName, e);
return DeleteControl.defaultDelete();
}
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
index 4a76731..e1bcb94 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
@@ -76,7 +76,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
} catch (Exception e) {
var errorMessage = e.getMessage();
- LOG.warn("Could not reconcile user {} for namespace {}: {}. {}", userName, namespace, errorMessage, e.getStackTrace());
+ LOG.warn("Could not reconcile user " + userName + " for namespace " + namespace, e);
return UserUpdateControlBuilder.fromResource(resource)
.withStatus(OzgCloudCustomResourceStatus.ERROR)
@@ -103,10 +103,10 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
service.deleteUser(user.getSpec(), namespace);
return DeleteControl.defaultDelete();
} catch (NotFoundException e) {
- LOG.info("Could not delete user {} in namespace {}, user not found.", userName, namespace);
+ LOG.info("Could not delete user " + userName + " in namespace " + namespace + " user not found.", e);
return DeleteControl.defaultDelete();
} catch (Exception e) {
- LOG.warn("Could not delete user {} in namespace {}.", userName, namespace);
+ LOG.warn("Could not delete user " + userName + " in namespace " + namespace, e);
return DeleteControl.defaultDelete();
}
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretReader.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretReader.java
index f82e19b..8e314c3 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretReader.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretReader.java
@@ -43,7 +43,7 @@ class UserSecretReader {
try {
return new String(Base64.decode(encodedPassword));
} catch (IOException e) {
- throw new RuntimeException("Could not decode content from secret (base64) for secret " + secret.getFullResourceName());
+ throw new RuntimeException("Could not decode content from secret (base64) for secret " + secret.getFullResourceName(), e);
}
}
}
--
GitLab