From 717a57b365bfeb8fc915214f7b645144f38051ef Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 29 Jun 2022 15:40:04 +0200 Subject: [PATCH] Fixed logs --- .../smartgears/handler/resourceregistry/ContextUtility.java | 5 +++++ .../resourceregistry/resourcemanager/EServiceManager.java | 6 +++--- .../resourcemanager/HostingNodeManager.java | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/ContextUtility.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/ContextUtility.java index 500ea0d..2159c45 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/ContextUtility.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/ContextUtility.java @@ -84,4 +84,9 @@ public class ContextUtility { return contextsUUID; } + public static String getContextNameFromUUID(UUID contextUUID) throws ResourceRegistryException { + ContextCache contextCache = ContextCache.getInstance(); + return contextCache.getContextFullNameByUUID(contextUUID); + } + } diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java index 0e45143..66336d4 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java @@ -147,9 +147,9 @@ public class EServiceManager { UUID uuid = UUID.fromString(applicationContext.container().id()); try { resourceRegistryPublisher.addToContext(HostingNode.NAME, uuid, contextUUID, false); - logger.info("{} with UUID {} successfully added to context ({})", HostingNode.NAME, uuid, ContextUtility.getCurrentContextName()); + logger.info("{} with UUID {} successfully added to context ({})", HostingNode.NAME, uuid, ContextUtility.getContextNameFromUUID(contextUUID)); } catch (Exception e) { - logger.error("Unable to add {} with UUID {} to context ({})", HostingNode.NAME, uuid, ContextUtility.getCurrentContextName(), e); + logger.error("Unable to add {} with UUID {} to context ({})", HostingNode.NAME, uuid, ContextUtility.getContextNameFromUUID(contextUUID), e); } } @@ -167,7 +167,7 @@ public class EServiceManager { public void removeFromContext(UUID contextUUID) throws ResourceNotFoundException, ContextNotFoundException, ResourceRegistryException { - String contextFullName = ContextCache.getInstance().getContextFullNameByUUID(contextUUID); + String contextFullName = ContextUtility.getContextNameFromUUID(contextUUID); UUID uuid = UUID.fromString(applicationContext.container().id()); try { resourceRegistryPublisher.removeResourceFromContext(HostingNode.NAME, uuid, contextUUID, false); diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java index 59a60ae..9b768eb 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java @@ -145,9 +145,9 @@ public class HostingNodeManager { UUID uuid = UUID.fromString(containerContext.id()); try { resourceRegistryPublisher.addToContext(HostingNode.NAME, uuid, contextUUID, false); - logger.info("{} with UUID {} successfully added to context ({})", HostingNode.NAME, uuid, ContextUtility.getCurrentContextName()); + logger.info("{} with UUID {} successfully added to context ({})", HostingNode.NAME, uuid, ContextUtility.getContextNameFromUUID(contextUUID)); } catch (Exception e) { - logger.error("Unable to add {} with UUID {} to context ({})", HostingNode.NAME, uuid, ContextUtility.getCurrentContextName(), e); + logger.error("Unable to add {} with UUID {} to context ({})", HostingNode.NAME, uuid, ContextUtility.getContextNameFromUUID(contextUUID), e); } } @@ -165,7 +165,7 @@ public class HostingNodeManager { public void removeFromContext(UUID contextUUID) throws ResourceNotFoundException, ContextNotFoundException, ResourceRegistryException { - String contextFullName = ContextCache.getInstance().getContextFullNameByUUID(contextUUID); + String contextFullName = ContextUtility.getContextNameFromUUID(contextUUID); UUID uuid = UUID.fromString(containerContext.id()); try { resourceRegistryPublisher.removeResourceFromContext(HostingNode.NAME, uuid, contextUUID, false);