Skip to content
Snippets Groups Projects
Commit 264e9c54 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4453 enhance logging

parent f5597eec
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch ...@@ -73,7 +73,7 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch
service.deleteIndexIfExists(namespace); service.deleteIndexIfExists(namespace);
return DeleteControl.defaultDelete(); return DeleteControl.defaultDelete();
} catch (Exception e) { } 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(); return DeleteControl.defaultDelete();
} }
} }
......
...@@ -29,18 +29,18 @@ public class OzgCloudElasticsearchService { ...@@ -29,18 +29,18 @@ public class OzgCloudElasticsearchService {
public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) { public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
try { try {
LOG.debug("{}: Get or create secret.", resource.getCRDName()); LOG.debug("{}: Get or create secret.", resource.getMetadata().getName());
var namespace = resource.getMetadata().getNamespace(); var namespace = resource.getMetadata().getNamespace();
var secretResource = getCredentialsSecretResource(namespace); var secretResource = getCredentialsSecretResource(namespace);
if (Objects.isNull(secretResource.get())) { 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); createCredentialSecret(secretResource, namespace);
LOG.info("{}: Secret creation successful.", resource.getCRDName()); LOG.info("{}: Secret creation successful.", resource.getMetadata().getName());
} }
return secretResource.get(); return secretResource.get();
} catch (Exception e) { } catch (Exception e) {
LOG.warn(resource.getCRDName() + ": Secret creation failed: ", e); LOG.warn(resource.getMetadata().getName() + ": Secret creation failed: ", e);
throw e; throw e;
} }
} }
......
...@@ -25,7 +25,7 @@ public class ElasticsearchRemoteService { ...@@ -25,7 +25,7 @@ public class ElasticsearchRemoteService {
try { try {
LOG.debug("{}: Test if elasticsearch index exits.", index); LOG.debug("{}: Test if elasticsearch index exits.", index);
var exists = client.indices().exists(builder -> builder.index(index)).value(); 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; return exists;
} catch (ElasticsearchException | IOException e) { } catch (ElasticsearchException | IOException e) {
throw new RuntimeException("Error checking index '" + index, e); throw new RuntimeException("Error checking index '" + index, e);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment