fix(reporter): start reporter when ManagementAPi start

Fixes gravitee-io/issues#5510
gravitee-io · May 5, 2021 · 0c96482 · 0c96482
1 parent 7c74dd2
commit 0c96482
Showing 1 changed file with 22 additions and 34 deletions.
diff --git a/...ervice/src/main/java/io/gravitee/am/management/service/impl/AuditReporterManagerImpl.java b/...ervice/src/main/java/io/gravitee/am/management/service/impl/AuditReporterManagerImpl.java
@@ -47,13 +47,13 @@
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CountDownLatch;
+
+import static java.util.Arrays.asList;
 
 /**
  * @author Titouan COMPIEGNE (titouan.compiegne at graviteesource.com)
@@ -143,10 +143,11 @@ protected void doStart() throws Exception {
 
         logger.info("Initializing audit reporters");
         List<io.gravitee.am.model.Reporter> reporters = reporterService.findAll().blockingGet();
+
         reporters.forEach(reporter -> {
             logger.info("Initializing audit reporter : {} for domain {}", reporter.getName(), reporter.getDomain());
             try {
-                AuditReporterLauncher launcher = new AuditReporterLauncher(reporter, false);
+                AuditReporterLauncher launcher = new AuditReporterLauncher(reporter);
                 domainService
                         .findById(reporter.getDomain())
                         .flatMapSingle(domain -> {
@@ -165,12 +166,8 @@ protected void doStart() throws Exception {
             }
         });
 
-        // deploy verticle
-        List<Reporter> allReporters = new ArrayList<>(auditReporters.values());
-        if (internalReporter != null) {
-            allReporters.add(new EventBusReporterWrapper(vertx, internalReporter));
-        }
-        deployReporterVerticle(allReporters);
+        // deploy internal reporter verticle
+        deployReporterVerticle(asList(new EventBusReporterWrapper(vertx, internalReporter)));
     }
 
     protected boolean useMongoReporter() {
@@ -314,7 +311,7 @@ private void reloadReporter(String reporterId) {
     }
 
     private void loadReporter(io.gravitee.am.model.Reporter reporter) {
-        AuditReporterLauncher launcher = new AuditReporterLauncher(reporter, true);
+        AuditReporterLauncher launcher = new AuditReporterLauncher(reporter);
         domainService
                 .findById(reporter.getDomain())
                 .flatMapSingle(domain -> {
@@ -330,42 +327,33 @@ private void loadReporter(io.gravitee.am.model.Reporter reporter) {
     }
 
     public class AuditReporterLauncher implements BiConsumer<GraviteeContext, Throwable> {
-        private boolean startEventBus;
         private io.gravitee.am.model.Reporter reporter;
 
-        private CountDownLatch countDownLatch = new CountDownLatch(1);
         private Throwable error;
 
-        public AuditReporterLauncher(io.gravitee.am.model.Reporter reporter, boolean startEventBus) {
-            this.startEventBus = startEventBus;
+        public AuditReporterLauncher(io.gravitee.am.model.Reporter reporter) {
             this.reporter = reporter;
         }
 
         @Override
         public void accept(GraviteeContext graviteeContext, Throwable throwable) throws Exception {
-            try {
-                if (graviteeContext != null) {
-                    Reporter auditReporter = reporterPluginManager.create(reporter.getType(), reporter.getConfiguration(), graviteeContext);
-                    if (auditReporter != null) {
-                        logger.info("Initializing audit reporter : {} for domain {}", reporter.getName(), reporter.getDomain());
-                        Reporter eventBusReporter = new EventBusReporterWrapper(vertx, reporter.getDomain(), auditReporter);
-                        auditReporters.put(reporter, eventBusReporter);
-                        try {
-                            if (startEventBus) {
-                                eventBusReporter.start();
-                            }
-                        } catch (Exception e) {
-                            logger.error("Unexpected error while loading reporter", e);
-                        }
+            if (graviteeContext != null) {
+                Reporter auditReporter = reporterPluginManager.create(reporter.getType(), reporter.getConfiguration(), graviteeContext);
+                if (auditReporter != null) {
+                    logger.info("Initializing audit reporter : {} for domain {}", reporter.getName(), reporter.getDomain());
+                    Reporter eventBusReporter = new EventBusReporterWrapper(vertx, reporter.getDomain(), auditReporter);
+                    auditReporters.put(reporter, eventBusReporter);
+                    try {
+                        eventBusReporter.start();
+                    } catch (Exception e) {
+                        logger.error("Unexpected error while loading reporter", e);
                     }
                 }
+            }
 
-                if (throwable != null) {
-                    logger.error("Unable to load reporter '{}'", reporter.getId(), throwable);
-                    this.error = throwable;
-                }
-            } finally {
-                this.countDownLatch.countDown();
+            if (throwable != null) {
+                logger.error("Unable to load reporter '{}'", reporter.getId(), throwable);
+                this.error = throwable;
             }
         }