bug + scalafmt

broadinstitute · Sep 17, 2024 · 3b39573 · 3b39573
1 parent b2b08c0
commit 3b39573
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/backend/src/main/scala/cromwell/backend/standard/StandardAsyncExecutionActor.scala b/backend/src/main/scala/cromwell/backend/standard/StandardAsyncExecutionActor.scala
@@ -936,9 +936,7 @@ trait StandardAsyncExecutionActor
     * @return A set of actions when the job is complete
     */
   def onTaskComplete(runStatus: StandardAsyncRunState, handle: StandardAsyncPendingExecutionHandle): Unit =
-    pollingResultMonitorActor.foreach(helper =>
-      helper.tell(AsyncJobHasFinished(runStatus.getClass.getSimpleName), self)
-    )
+    pollingResultMonitorActor.foreach(helper => helper.tell(AsyncJobHasFinished(runStatus), self))
 
   /**
     * Attempts to abort a job when an abort signal is retrieved.

diff --git a/...tch/src/main/scala/cromwell/backend/google/batch/actors/BatchPollResultMonitorActor.scala b/...tch/src/main/scala/cromwell/backend/google/batch/actors/BatchPollResultMonitorActor.scala
@@ -55,9 +55,19 @@ class BatchPollResultMonitorActor(pollMonitorParameters: PollMonitorParameters)
     case message: PollResultMessage =>
       message match {
         case ProcessThisPollResult(pollResult: RunStatus) => processPollResult(pollResult)
-        case ProcessThisPollResult(result) => params.logger.foreach(logger => logger.error(s"Programmer error: Received Poll Result of unknown type. Expected ${RunStatus.getClass.getSimpleName} but got ${result.getClass.getSimpleName}."))
+        case ProcessThisPollResult(result) =>
+          params.logger.foreach(logger =>
+            logger.error(
+              s"Programmer error: Received Poll Result of unknown type. Expected ${RunStatus.getClass.getSimpleName} but got ${result.getClass.getSimpleName}."
+            )
+          )
         case AsyncJobHasFinished(pollResult: RunStatus) => handleAsyncJobFinish(pollResult.getClass.getSimpleName)
-        case AsyncJobHasFinished(result) => params.logger.foreach(logger => logger.error(s"Programmer error: Received Poll Result of unknown type. Expected ${AsyncJobHasFinished.getClass.getSimpleName} but got ${result.getClass.getSimpleName}."))
+        case AsyncJobHasFinished(result) =>
+          params.logger.foreach(logger =>
+            logger.error(
+              s"Programmer error: Received Poll Result of unknown type. Expected ${AsyncJobHasFinished.getClass.getSimpleName} but got ${result.getClass.getSimpleName}."
+            )
+          )
       }
     case _ =>
       println("Programmer error: Cost Helper received message of type other than CostPollingMessage")

diff --git a/.../src/main/scala/cromwell/backend/google/pipelines/common/PapiPollResultMonitorActor.scala b/.../src/main/scala/cromwell/backend/google/pipelines/common/PapiPollResultMonitorActor.scala
@@ -3,7 +3,13 @@ package cromwell.backend.google.pipelines.common
 import akka.actor.{ActorRef, Props}
 import cromwell.backend.{BackendJobDescriptor, BackendWorkflowDescriptor, Platform}
 import cromwell.backend.google.pipelines.common.api.RunStatus
-import cromwell.backend.standard.pollmonitoring.{AsyncJobHasFinished, PollMonitorParameters, PollResultMessage, PollResultMonitorActor, ProcessThisPollResult}
+import cromwell.backend.standard.pollmonitoring.{
+  AsyncJobHasFinished,
+  PollMonitorParameters,
+  PollResultMessage,
+  PollResultMonitorActor,
+  ProcessThisPollResult
+}
 import cromwell.backend.validation.ValidatedRuntimeAttributes
 import cromwell.core.logging.JobLogger
 import cromwell.services.metadata.CallMetadataKeys
@@ -19,7 +25,13 @@ object PapiPollResultMonitorActor {
             logger: JobLogger
   ): Props = Props(
     new PapiPollResultMonitorActor(
-      PollMonitorParameters(serviceRegistry, workflowDescriptor, jobDescriptor, runtimeAttributes, platform, Option(logger))
+      PollMonitorParameters(serviceRegistry,
+                            workflowDescriptor,
+                            jobDescriptor,
+                            runtimeAttributes,
+                            platform,
+                            Option(logger)
+      )
     )
   )
 }
@@ -42,9 +54,19 @@ class PapiPollResultMonitorActor(parameters: PollMonitorParameters) extends Poll
     case message: PollResultMessage =>
       message match {
         case ProcessThisPollResult(pollResult: RunStatus) => processPollResult(pollResult)
-        case ProcessThisPollResult(result) => params.logger.foreach(logger => logger.error(s"Programmer error: Received Poll Result of unknown type. Expected ${RunStatus.getClass.getSimpleName} but got ${result.getClass.getSimpleName}."))
+        case ProcessThisPollResult(result) =>
+          params.logger.foreach(logger =>
+            logger.error(
+              s"Programmer error: Received Poll Result of unknown type. Expected ${RunStatus.getClass.getSimpleName} but got ${result.getClass.getSimpleName}."
+            )
+          )
         case AsyncJobHasFinished(pollResult: RunStatus) => handleAsyncJobFinish(pollResult.getClass.getSimpleName)
-        case AsyncJobHasFinished(result) => params.logger.foreach(logger => logger.error(s"Programmer error: Received Poll Result of unknown type. Expected ${AsyncJobHasFinished.getClass.getSimpleName} but got ${result.getClass.getSimpleName}."))
+        case AsyncJobHasFinished(result) =>
+          params.logger.foreach(logger =>
+            logger.error(
+              s"Programmer error: Received Poll Result of unknown type. Expected ${AsyncJobHasFinished.getClass.getSimpleName} but got ${result.getClass.getSimpleName}."
+            )
+          )
       }
     case _ =>
       println("Programmer error: Cost Helper received message of type other than CostPollingMessage")