Merge pull request #62 from atlarge-research/bug/tutorial

Implement various fixes in preparation for tutorial

3 files changed, 13 insertions, 8 deletions

diff --git a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
index 80b3bb20..6369fdd8 100644
--- a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
+++ b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
@@ -325,7 +325,7 @@ public class RunnerCli : CliktCommand(name = "runner") {
 
                     logger.info { "Successfully finished scenario $id" }
                 } catch (e: Exception) {
-                    logger.warn(e) { "Scenario failed to finish" }
+                    logger.error(e) { "Scenario failed to finish" }
                     manager.fail(id)
                 } finally {
                     heartbeat.cancel()
diff --git a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
index 80bd20f7..8bd1eefb 100644
--- a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
+++ b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
@@ -81,6 +81,9 @@ public class TopologyParser(private val collection: MongoCollection<Document>, p
                     memory.get("sizeMb", Number::class.java).toLong()
                 )
             }
+
+            val energyConsumptionW = machine.getList("cpus", Document::class.java).sumBy { it.getInteger("energyConsumptionW") }.toDouble()
+
             nodes.add(
                 SimBareMetalDriver(
                     coroutineScope,
@@ -89,10 +92,7 @@ public class TopologyParser(private val collection: MongoCollection<Document>, p
                     "node-$clusterId-$position",
                     mapOf(NODE_CLUSTER to clusterId),
                     SimMachineModel(processors, memoryUnits),
-                    // For now we assume a simple linear load model with an idle draw of ~200W and a maximum
-                    // power draw of 350W.
-                    // Source: https://stackoverflow.com/questions/6128960
-                    LinearLoadPowerModel(200.0, 350.0)
+                    LinearLoadPowerModel(energyConsumptionW, 2 * energyConsumptionW)
                 )
             )
         }
diff --git a/simulator/opendc-runner-web/src/main/resources/log4j2.xml b/simulator/opendc-runner-web/src/main/resources/log4j2.xml
index 87179332..503bc5dc 100644
--- a/simulator/opendc-runner-web/src/main/resources/log4j2.xml
+++ b/simulator/opendc-runner-web/src/main/resources/log4j2.xml
@@ -23,21 +23,26 @@
   ~ SOFTWARE.
   -->
 
-<Configuration status="WARN">
+<Configuration status="WARN" packages="org.apache.logging.log4j.core,io.sentry.log4j2">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} [%highlight{%-5level}] %logger{36} - %msg%n" disableAnsi="false"/>
         </Console>
+
+        <Sentry name="Sentry" />
     </Appenders>
     <Loggers>
         <Logger name="org.opendc" level="warn" additivity="false">
             <AppenderRef ref="Console"/>
+            <AppenderRef ref="Sentry"/>
         </Logger>
         <Logger name="org.opendc.runner" level="info" additivity="false">
             <AppenderRef ref="Console"/>
+            <AppenderRef ref="Sentry"/>
         </Logger>
-        <Root level="error">
-            <AppenderRef ref="Console"/>
+        <Root level="info">
+            <AppenderRef level="error" ref="Console"/>
+            <AppenderRef ref="Sentry"/>
         </Root>
     </Loggers>
 </Configuration>