From bb55ce6f4407999c457e1fe7c36e8acacb93bce7 Mon Sep 17 00:00:00 2001 From: lucio Date: Tue, 9 Apr 2024 16:41:45 +0200 Subject: [PATCH] config dir moved in contexPath instead of ServiceName --- .../context/application/DefaultApplicationContext.java | 6 ++---- .../org/gcube/smartgears/managers/ContainerManager.java | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/context/application/DefaultApplicationContext.java b/src/main/java/org/gcube/smartgears/context/application/DefaultApplicationContext.java index 766d71c..d566fd7 100644 --- a/src/main/java/org/gcube/smartgears/context/application/DefaultApplicationContext.java +++ b/src/main/java/org/gcube/smartgears/context/application/DefaultApplicationContext.java @@ -176,14 +176,12 @@ public class DefaultApplicationContext implements ApplicationContext { throw new IllegalStateException("invalid node configuration: home " + home + " does not exist or is not a directory or cannot be accessed in read mode"); - String appName = this.configuration.name(); - - Path appSpecificConfigurationPath = Paths.get(home, APPS_CONFIG__DIR, appName); + Path appSpecificConfigurationPath = Paths.get(home, APPS_CONFIG__DIR, this.sctx.getContextPath()); File appSpecificConfiguration = appSpecificConfigurationPath.toFile(); if (!(appSpecificConfiguration.exists() && appSpecificConfiguration.isDirectory() && appSpecificConfiguration.canRead())) { - log.warn("specific configuration folder for {} not found", appName); + log.warn("specific configuration folder for {} not found", this.sctx.getContextPath()); return null; } diff --git a/src/main/java/org/gcube/smartgears/managers/ContainerManager.java b/src/main/java/org/gcube/smartgears/managers/ContainerManager.java index 7012218..c36a074 100644 --- a/src/main/java/org/gcube/smartgears/managers/ContainerManager.java +++ b/src/main/java/org/gcube/smartgears/managers/ContainerManager.java @@ -18,7 +18,6 @@ import org.gcube.common.events.Observes.Kind; import org.gcube.smartgears.configuration.Mode; import org.gcube.smartgears.context.application.ApplicationContext; import org.gcube.smartgears.context.container.ContainerContext; -import org.gcube.smartgears.handlers.ProfileEvents; import org.gcube.smartgears.handlers.container.ContainerHandler; import org.gcube.smartgears.handlers.container.ContainerLifecycleEvent; import org.gcube.smartgears.handlers.container.ContainerPipeline;