diff --git a/be2-scala/src/main/resources/logback.xml b/be2-scala/src/main/resources/logback.xml index 5247a6e776..b13c778b18 100644 --- a/be2-scala/src/main/resources/logback.xml +++ b/be2-scala/src/main/resources/logback.xml @@ -1,14 +1,20 @@ + %d{HH:mm:ss.SSS} - %highlight(%-5level) : %logger{0} > %msg%n + + + + + diff --git a/be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/ProcessMessagesHandler.scala b/be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/ProcessMessagesHandler.scala index 3502c306f6..79f53e7440 100644 --- a/be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/ProcessMessagesHandler.scala +++ b/be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/ProcessMessagesHandler.scala @@ -57,13 +57,12 @@ object ProcessMessagesHandler extends AskPatternConstants { case Some(rumorList) => val orderedRumors = rumorList.sortBy(_.timestamp) var processedRumors: List[Rumor] = List.empty - var successful = true - for rumor <- orderedRumors if successful do { - successful = rumorHandler(messageRegistry, rumor) && writeRumorInDb(dbActorRef, rumor) - processedRumors = processedRumors.prepended(rumor) + for rumor <- orderedRumors do { + if writeRumorInDb(dbActorRef, rumor) && rumorHandler(messageRegistry, rumor) then + processedRumors = processedRumors.prepended(rumor) } - if !successful then - system.log.info(s"Failed to process all rumors from rumorStateAnswer $jsonId. Processed rumors where ${processedRumors.map(rumor => (rumor.senderPk, rumor.rumorId)).tail}. Unprocessed rumors not written in memory.") + if processedRumors.size != orderedRumors.size then + system.log.info(s"Failed to process all rumors from rumorStateAnswer $jsonId. Processed rumors where ${if processedRumors.nonEmpty then processedRumors.map(rumor => (rumor.senderPk, rumor.rumorId)).tail else processedRumors}. Unprocessed rumors not written in memory.") Left(PipelineError( ErrorCodes.SERVER_ERROR.id, s"Rumor state handler was not able to process all rumors from $msg",