gCubeSystem
/
common-smartgears
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config dir moved in contexPath instead of ServiceName

This commit is contained in:
lucio 2024-04-09 16:41:45 +02:00
parent 1fbd524fc4
commit bb55ce6f44
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/smartgears/context/application/DefaultApplicationContext.java
View File

@ -176,14 +176,12 @@ public class DefaultApplicationContext implements ApplicationContext {
throw new IllegalStateException("invalid node configuration: home " + home throw new IllegalStateException("invalid node configuration: home " + home
+ " does not exist or is not a directory or cannot be accessed in read mode"); + " 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, this.sctx.getContextPath());
Path appSpecificConfigurationPath = Paths.get(home, APPS_CONFIG__DIR, appName);
File appSpecificConfiguration = appSpecificConfigurationPath.toFile(); File appSpecificConfiguration = appSpecificConfigurationPath.toFile();
if (!(appSpecificConfiguration.exists() && appSpecificConfiguration.isDirectory() && appSpecificConfiguration.canRead())) { 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; return null;
} }

1
src/main/java/org/gcube/smartgears/managers/ContainerManager.java
View File

@ -18,7 +18,6 @@ import org.gcube.common.events.Observes.Kind;
import org.gcube.smartgears.configuration.Mode; import org.gcube.smartgears.configuration.Mode;
import org.gcube.smartgears.context.application.ApplicationContext; import org.gcube.smartgears.context.application.ApplicationContext;
import org.gcube.smartgears.context.container.ContainerContext; 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.ContainerHandler;
import org.gcube.smartgears.handlers.container.ContainerLifecycleEvent; import org.gcube.smartgears.handlers.container.ContainerLifecycleEvent;
import org.gcube.smartgears.handlers.container.ContainerPipeline; import org.gcube.smartgears.handlers.container.ContainerPipeline;