diff options
Diffstat (limited to 'opendc-experiments/opendc-experiments-base/src')
3 files changed, 19 insertions, 20 deletions
diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentCli.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentCli.kt index ad662f25..e3b57cb4 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentCli.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentCli.kt @@ -51,11 +51,9 @@ internal class ExperimentCommand : CliktCommand(name = "experiment") { val experiment = getExperiment(experimentPath) HTTPClient.getInstance()?.sendExperiment(experimentPath) runExperiment(experiment) - } catch (e: IOException) { println("${e.message}") } - } } /** diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentListener.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentListener.kt new file mode 100644 index 00000000..de759c0f --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentListener.kt @@ -0,0 +1,19 @@ +package org.opendc.experiments.base.runner + +import org.opendc.common.utils.JavalinRunner +import org.opendc.common.utils.PostgresqlDB +import org.opendc.common.utils.Redis + +/** + * Established a connection with PostgreSQL. + * Creates a Javalin HTTP server and listens for requests. + * + * @author Mateusz Kwiatkowski + * + * @see <a href=https://javalin.io/documentation>https://javalin.io/documentation</a> + */ +public fun runListener() { + PostgresqlDB() + Redis().run() + JavalinRunner() +}
\ No newline at end of file diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentRunner.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentRunner.kt index 8eab48e6..079db6fc 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentRunner.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentRunner.kt @@ -24,9 +24,6 @@ package org.opendc.experiments.base.runner import me.tongfei.progressbar.ProgressBarBuilder import me.tongfei.progressbar.ProgressBarStyle -import org.opendc.common.utils.JavalinRunner -import org.opendc.common.utils.PostgresqlDB -import org.opendc.common.utils.Redis import org.opendc.experiments.base.experiment.Scenario /** @@ -61,18 +58,3 @@ public fun runExperiment(experiment: List<Scenario>) { } pb.close() } - -/** - * Established a connection with PostgreSQL. - * Creates a Javalin HTTP server and listens for requests. - * - * @author Mateusz Kwiatkowski - * - * @see <a href=https://javalin.io/documentation>https://javalin.io/documentation</a> - */ -public fun runListener() { - PostgresqlDB() - JavalinRunner() - Redis().run() - println("Hello world, this means that Javalin already runs on another thread.") -}
\ No newline at end of file |
