fixup! Fixes #16122: Stop listenning for inventories on port 80

Fixes #16133: Missing diffDisplayer service in 6.0
Normation · Nov 6, 2019 · 31328bc · 31328bc
1 parent ab3da06
commit 31328bc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/...dder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala b/...dder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala
@@ -82,6 +82,7 @@ class EventLogDetailsGenerator(
   , modificationService : ModificationService
   , personIdentService  : PersonIdentService
   , linkUtil            : LinkUtil
+  , diffDisplayer       : DiffDisplayer
 ) extends Loggable {
 
   private[this] val xmlPretty = new scala.xml.PrettyPrinter(80, 2)
@@ -302,7 +303,6 @@ class EventLogDetailsGenerator(
             xml }
 
         case mod:ModifyRule =>
-          val diffDisplayer = new DiffDisplayer(linkUtil)
           "*" #> { val xml : NodeSeq = logDetailsService.getRuleModifyDetails(mod.details) match {
             case Full(modDiff) =>
               <div class="evloglmargin">
@@ -1044,7 +1044,6 @@ class EventLogDetailsGenerator(
   }
 
   private[this] def ruleDetails(xml:NodeSeq, rule:Rule, groupLib: FullNodeGroupCategory, rootRuleCategory: RuleCategory) = {
-    val diffDisplayer = new DiffDisplayer(linkUtil)
     (
       "#ruleID"    #> rule.id.value &
         "#ruleName"  #> rule.name &

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
@@ -645,6 +645,7 @@ object RudderConfig extends Loggable {
   )
   val workflowEventLogService = new WorkflowEventLogServiceImpl(eventLogRepository,uuidGen)
   val diffService: DiffService = new DiffServiceImpl()
+  lazy val diffDisplayer = new DiffDisplayer(linkUtil)
   lazy val commitAndDeployChangeRequest : CommitAndDeployChangeRequestService =
     new CommitAndDeployChangeRequestServiceImpl(
         uuidGen
@@ -1357,6 +1358,7 @@ object RudderConfig extends Loggable {
     , modificationService
     , personIdentServiceImpl
     , linkUtil
+    , diffDisplayer
   )
   private[this] lazy val fileManagerImpl = new FileManager(UPLOAD_ROOT_DIRECTORY)
   private[this] lazy val databaseManagerImpl = new DatabaseManagerImpl(reportsRepositoryImpl, updateExpectedRepo)

diff --git a/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala b/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala
@@ -36,12 +36,6 @@ import com.normation.errors.RudderError
 import com.normation.errors.SystemError
 import _root_.zio._
 import _root_.zio.syntax._
-import _root_.zio.clock._
-import _root_.zio.random._
-import _root_.zio.blocking._
-import _root_.zio.console._
-import _root_.zio.system.{System => ZSystem}
-import _root_.zio.internal._
 import com.normation.zio.ZioRuntime
 import org.slf4j.Logger
 

diff --git a/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala b/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala
@@ -513,8 +513,6 @@ import _root_.zio.internal._
     def time = (System.currentTimeMillis()-start).toString
 
 
-    import cats._
-    import cats.syntax._
     import _root_.zio.interop.catz._