From cf094b088ed58f64cfcc7edc5b9371f053f9c1f7 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 14 Oct 2020 14:57:33 +0200 Subject: [PATCH] Do not stop the service if publishing o new IS fails --- .../vremanagement/executor/SmartExecutorInitializator.java | 7 +++++-- .../executor/ispublisher/GCoreISPublisher.java | 2 +- .../executor/ispublisher/RestISPublisher.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitializator.java b/src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitializator.java index 40169bf..506a054 100644 --- a/src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitializator.java +++ b/src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitializator.java @@ -8,6 +8,7 @@ import org.gcube.smartgears.ContextProvider; import org.gcube.smartgears.context.application.ApplicationContext; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.ispublisher.ISPublisher; +import org.gcube.vremanagement.executor.ispublisher.RestISPublisher; import org.gcube.vremanagement.executor.json.ExtendedSEMapper; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceFactory; @@ -66,8 +67,10 @@ public class SmartExecutorInitializator implements ApplicationManager { try { isPublisher.publishPlugins(availablePlugins); }catch (Exception e) { - logger.error("Unable to Create ServiceEndpoint for scope {}. The Service will be aborted", scope, e); - throw new RuntimeException(e); + logger.error("Unable to create plugins is resources in context {}. The Service will be aborted", scope, e); + if(!(isPublisher instanceof RestISPublisher)) { + throw new RuntimeException(e); + } } } diff --git a/src/main/java/org/gcube/vremanagement/executor/ispublisher/GCoreISPublisher.java b/src/main/java/org/gcube/vremanagement/executor/ispublisher/GCoreISPublisher.java index 7491077..90fb0cf 100644 --- a/src/main/java/org/gcube/vremanagement/executor/ispublisher/GCoreISPublisher.java +++ b/src/main/java/org/gcube/vremanagement/executor/ispublisher/GCoreISPublisher.java @@ -31,7 +31,7 @@ import org.gcube.vremanagement.executor.pluginmanager.PluginManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class GCoreISPublisher extends ISPublisher { +public class GCoreISPublisher extends ISPublisher { private static Logger logger = LoggerFactory.getLogger(GCoreISPublisher.class); diff --git a/src/main/java/org/gcube/vremanagement/executor/ispublisher/RestISPublisher.java b/src/main/java/org/gcube/vremanagement/executor/ispublisher/RestISPublisher.java index 1806424..14d0101 100644 --- a/src/main/java/org/gcube/vremanagement/executor/ispublisher/RestISPublisher.java +++ b/src/main/java/org/gcube/vremanagement/executor/ispublisher/RestISPublisher.java @@ -37,7 +37,7 @@ import org.gcube.vremanagement.executor.pluginmanager.PluginManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class RestISPublisher extends ISPublisher { +public class RestISPublisher extends ISPublisher { private static Logger logger = LoggerFactory.getLogger(RestISPublisher.class);