fix: changed the syntex to slowly get rid of the Config class

2 files changed, 9 insertions, 12 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 96071833..78ce6158 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
@@ -30,7 +30,6 @@ import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.file
 import org.opendc.common.utils.Config
 import org.opendc.common.utils.ConfigReader
-import org.opendc.common.utils.Kafka
 import org.opendc.common.utils.PostgresqlDB
 import org.opendc.experiments.base.experiment.getExperiment
 import java.io.File
@@ -47,11 +46,9 @@ public fun main(args: Array<String>) {
     else ExperimentListener().main(args)
 }
 
-
-
 /**
- * @author Mateusz
  * Opens a client socket from `config`, but otherwise works as before.
+ * @author Mateusz
  */
 internal class ExperimentCommand : CliktCommand(name = "experiment") {
     private val configPath by option("--config-path", help = "path to config file")
@@ -68,9 +65,7 @@ internal class ExperimentCommand : CliktCommand(name = "experiment") {
         var clientSocket : Socket? = null
 
         try {
-            clientSocket = Socket(config.address, config.port)
             Config.setConfigSocket(clientSocket)
-            Config.setKafkaInstance(Kafka(config.topic, config.address, config.kafka))
             val experiment = getExperiment(experimentPath)
             runExperiment(experiment)
 
@@ -84,8 +79,8 @@ internal class ExperimentCommand : CliktCommand(name = "experiment") {
 }
 
 /**
- * @author Mateusz
  * Creates a server socket and database connection from `config`.
+ * @author Mateusz
  */
 internal class ExperimentListener: CliktCommand(name = "listener") {
     private val configPath by option("--config-path", help = "path to config file")
@@ -96,9 +91,8 @@ internal class ExperimentListener: CliktCommand(name = "listener") {
         val configReader = ConfigReader()
         var serverSocket: ServerSocket? = null
         val config = configReader.read(configPath)
-        Config.setDB(PostgresqlDB(config.address, config.postgresql, config.database, config.username, config.password))
-
         try {
+
             val inetAddress = InetAddress.getByName(config.address)
             serverSocket = ServerSocket(config.port, config.backlog, inetAddress)
             runListener(serverSocket)
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 9fee6cf9..3867a9f0 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
@@ -25,11 +25,11 @@ package org.opendc.experiments.base.runner
 import me.tongfei.progressbar.ProgressBarBuilder
 import me.tongfei.progressbar.ProgressBarStyle
 import org.opendc.common.utils.Config
+import org.opendc.common.utils.PostgresqlDB
 import org.opendc.experiments.base.experiment.Scenario
 import java.io.IOException
 import java.net.ServerSocket
 import java.net.Socket
-import org.opendc.demo.runRequest
 
 /**
  * Run scenario when no pool is available for parallel execution
@@ -71,16 +71,19 @@ public fun runExperiment(experiment: List<Scenario>) {
  */
 public fun runListener(socket: ServerSocket) {
     var client : Socket? = null
+    val db = PostgresqlDB()
     try {
         client = socket.accept()
         Config.setConfigSocket(client)
-        val request = ByteArray(1024)
+        // val request = ByteArray(1024)
 
         while(true){
+/*
             val ret : Int? = Config.getConfigReader()?.read(request)
             if(ret == -1) break
             if(ret != null && ret > 0) runRequest(String(request, 0, ret))
-        }
+
+ */        }
 
     } catch (e: IOException) {
         println("${e.message}")