From 264e9c54b2da5ba78c42be432f5e1c9506e23c53 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 5 Jan 2024 14:35:58 +0100
Subject: [PATCH] OZG-4453 enhance logging
---
.../de/ozgcloud/operator/ElasticsearchReconciler.java | 2 +-
.../ozgcloud/operator/OzgCloudElasticsearchService.java | 8 ++++----
.../common/elasticsearch/ElasticsearchRemoteService.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
index 13a30f7..f1a2ba0 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
@@ -73,7 +73,7 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch
service.deleteIndexIfExists(namespace);
return DeleteControl.defaultDelete();
} catch (Exception e) {
- LOG.warn(resource.getCRDName() + ": Could not cleanup elasticsearch resource.", e);
+ LOG.warn(resource.getMetadata().getName() + ": Could not cleanup elasticsearch resource.", e);
return DeleteControl.defaultDelete();
}
}
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
index d5ce0f9..57f19ad 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
@@ -29,18 +29,18 @@ public class OzgCloudElasticsearchService {
public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
try {
- LOG.debug("{}: Get or create secret.", resource.getCRDName());
+ LOG.debug("{}: Get or create secret.", resource.getMetadata().getName());
var namespace = resource.getMetadata().getNamespace();
var secretResource = getCredentialsSecretResource(namespace);
if (Objects.isNull(secretResource.get())) {
- LOG.info("{}: Secret not exists, create one ...", resource.getCRDName());
+ LOG.info("{}: Secret not exists, create one ...", resource.getMetadata().getName());
createCredentialSecret(secretResource, namespace);
- LOG.info("{}: Secret creation successful.", resource.getCRDName());
+ LOG.info("{}: Secret creation successful.", resource.getMetadata().getName());
}
return secretResource.get();
} catch (Exception e) {
- LOG.warn(resource.getCRDName() + ": Secret creation failed: ", e);
+ LOG.warn(resource.getMetadata().getName() + ": Secret creation failed: ", e);
throw e;
}
}
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
index b9d3073..12c4c5d 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
@@ -25,7 +25,7 @@ public class ElasticsearchRemoteService {
try {
LOG.debug("{}: Test if elasticsearch index exits.", index);
var exists = client.indices().exists(builder -> builder.index(index)).value();
- LOG.debug("{}: Elasticsearch index exists: {}", exists);
+ LOG.debug("{}: Elasticsearch index exists: {}", index, exists);
return exists;
} catch (ElasticsearchException | IOException e) {
throw new RuntimeException("Error checking index '" + index, e);
--
GitLab