Fixes #22646: We should initialize campaign service after plugin were…

… added or else current events will be skipped (before being added again)
Normation · Apr 24, 2023 · 8b676de · 8b676de
1 parent 7a213a1
commit 8b676de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -263,6 +263,9 @@ class Boot extends Loggable {
     //// init plugin code (ie: bootstrap their objects / connections / etc ////
     val plugins = initPlugins()
 
+    // Run post plugin init actions:
+    RudderConfig.postPluginInitActions
+
     ////////// CACHE INVALIDATION FOR RESOURCES //////////
     // fails on invalid JSON body because it's unsufferable
     LiftRules.statelessDispatch.append {

diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala
@@ -1144,6 +1144,12 @@ object RudderConfig extends Loggable {
     }
   }
 
+  def postPluginInitActions = {
+    // todo: scheduler interval should be a property
+    ZioRuntime.unsafeRun(jsonReportsAnalyzer.start(5.seconds).forkDaemon.provideLayer(ZioRuntime.layers))
+    ZioRuntime.unsafeRun(MainCampaignService.start(mainCampaignService))
+  }
+
 }
 
 /*
@@ -3162,11 +3168,6 @@ object RudderConfigInit {
     lazy val mainCampaignService = new MainCampaignService(campaignEventRepo, campaignRepo, uuidGen, 1, 1)
     lazy val jsonReportsAnalyzer = JSONReportsAnalyser(reportsRepository, propertyRepository)
 
-    // todo: scheduler interval should be a property
-    ZioRuntime.unsafeRun(jsonReportsAnalyzer.start(5.seconds).forkDaemon.provideLayer(ZioRuntime.layers))
-
-    ZioRuntime.unsafeRun(MainCampaignService.start(mainCampaignService))
-
     /**
    * *************************************************
    * Bootstrap check actions