2 files changed, 11 insertions, 10 deletions
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt
index b9d5a3f5..960d5ebd 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt
@@ -226,11 +226,12 @@ class RunnerCli : CliktCommand(name = "runner") {
 
                 val serviceMetrics = collectServiceMetrics(clock.millis(), simulator.producers[0])
                 logger.debug {
-                    "Finish " +
-                        "SUBMIT=${serviceMetrics.instanceCount} " +
-                        "FAIL=${serviceMetrics.failedInstanceCount} " +
-                        "QUEUE=${serviceMetrics.queuedInstanceCount} " +
-                        "RUNNING=${serviceMetrics.runningInstanceCount}"
+                    "Scheduler " +
+                        "Success=${serviceMetrics.attemptsSuccess} " +
+                        "Failure=${serviceMetrics.attemptsFailure} " +
+                        "Error=${serviceMetrics.attemptsError} " +
+                        "Pending=${serviceMetrics.serversPending} " +
+                        "Active=${serviceMetrics.serversActive}"
                 }
             }
         } catch (cause: Throwable) {
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebComputeMonitor.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebComputeMonitor.kt
index 4b813310..5f2c474b 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebComputeMonitor.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebComputeMonitor.kt
@@ -81,11 +81,11 @@ class WebComputeMonitor : ComputeMonitor {
 
     override fun record(data: ServiceData) {
         serviceMetrics = AggregateServiceMetrics(
-            max(data.instanceCount, serviceMetrics.vmTotalCount),
-            max(data.queuedInstanceCount, serviceMetrics.vmWaitingCount),
-            max(data.runningInstanceCount, serviceMetrics.vmActiveCount),
-            max(data.finishedInstanceCount, serviceMetrics.vmInactiveCount),
-            max(data.failedInstanceCount, serviceMetrics.vmFailedCount),
+            max(data.attemptsSuccess, serviceMetrics.vmTotalCount),
+            max(data.serversPending, serviceMetrics.vmWaitingCount),
+            max(data.serversActive, serviceMetrics.vmActiveCount),
+            max(0, serviceMetrics.vmInactiveCount),
+            max(data.attemptsFailure, serviceMetrics.vmFailedCount),
         )
     }