This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push: new e9c4ffe8 Headless chaos for #817 e9c4ffe8 is described below commit e9c4ffe812912516c9606061fba74c03135f6093 Author: Marat Gubaidullin <ma...@talismancloud.io> AuthorDate: Fri Sep 1 15:49:34 2023 -0400 Headless chaos for #817 --- .../org/apache/camel/karavan/service/GiteaService.java | 1 - .../org/apache/camel/karavan/service/KaravanService.java | 1 - .../org/apache/camel/karavan/headless/EventService.java | 1 - .../apache/camel/karavan/headless/HeadlessService.java | 16 ++++++++++++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GiteaService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GiteaService.java index 2cd4c6ce..1930be7c 100644 --- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GiteaService.java +++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GiteaService.java @@ -29,7 +29,6 @@ import org.jboss.logging.Logger; import java.util.List; import java.util.Map; -import java.util.UUID; @ApplicationScoped public class GiteaService { diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java index ae1adc80..7a811548 100644 --- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java +++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java @@ -35,7 +35,6 @@ import jakarta.enterprise.event.Observes; import jakarta.inject.Inject; import java.io.IOException; - @Singleton public class KaravanService { diff --git a/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/EventService.java b/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/EventService.java index 533a0953..116a00d8 100644 --- a/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/EventService.java +++ b/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/EventService.java @@ -22,7 +22,6 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.camel.karavan.infinispan.InfinispanService; - @ApplicationScoped public class EventService { diff --git a/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/HeadlessService.java b/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/HeadlessService.java index e822f800..d63ac25b 100644 --- a/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/HeadlessService.java +++ b/karavan-web/karavan-headless/src/main/java/org/apache/camel/karavan/headless/HeadlessService.java @@ -18,6 +18,8 @@ package org.apache.camel.karavan.headless; import io.quarkus.runtime.StartupEvent; import io.quarkus.scheduler.Scheduled; +import io.quarkus.vertx.ConsumeEvent; +import io.vertx.core.eventbus.EventBus; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Observes; import jakarta.inject.Inject; @@ -35,9 +37,19 @@ public class HeadlessService { @Inject CamelService camelService; - void onStart(@Observes StartupEvent ev) { + @Inject + EventBus eventBus; + + private static final String START_SERVICES = "START_SERVICES"; + + void onStart(@Observes StartupEvent ev) throws Exception { + eventBus.publish(START_SERVICES, null); + } + + @ConsumeEvent(value = START_SERVICES, blocking = true) + void startServices(String data) throws Exception { LOGGER.info("Starting Headless Karavan"); - infinispanService.start(true); + infinispanService.tryStart(true); } @Scheduled(every = "{karavan.camel.status.interval}", concurrentExecution = Scheduled.ConcurrentExecution.SKIP)