diff --git a/frameworks/Scala/sharaf/build.mill b/frameworks/Scala/sharaf/build.mill index be7a09e418d..c1723ad5f09 100644 --- a/frameworks/Scala/sharaf/build.mill +++ b/frameworks/Scala/sharaf/build.mill @@ -7,8 +7,9 @@ object `package` extends RootModule with ScalaModule { def scalaVersion = "3.6.2" def ivyDeps = Agg( ivy"ba.sake::sharaf:0.8.1", - ivy"ba.sake::squery:0.6.4", + ivy"ba.sake::squery:0.7.0", ivy"org.postgresql:postgresql:42.6.0", - ivy"com.zaxxer:HikariCP:5.0.1" + ivy"com.zaxxer:HikariCP:5.0.1", + ivy"org.slf4j:slf4j-nop:2.0.17" // disable logging ) -} \ No newline at end of file +} diff --git a/frameworks/Scala/sharaf/sharaf.dockerfile b/frameworks/Scala/sharaf/sharaf.dockerfile index d15c119240b..e2743d08638 100644 --- a/frameworks/Scala/sharaf/sharaf.dockerfile +++ b/frameworks/Scala/sharaf/sharaf.dockerfile @@ -11,4 +11,4 @@ RUN ./mill assembly EXPOSE 8080 -CMD ["java", "-server", "-Xms1g", "-Xmx1g", "-jar", "out/assembly.dest/out.jar"] +CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-jar", "out/assembly.dest/out.jar"] diff --git a/frameworks/Scala/sharaf/src/db.scala b/frameworks/Scala/sharaf/src/db.scala index 960715e9c12..795d4b02405 100644 --- a/frameworks/Scala/sharaf/src/db.scala +++ b/frameworks/Scala/sharaf/src/db.scala @@ -10,7 +10,7 @@ class DAO { ds.setJdbcUrl("jdbc:postgresql://tfb-database:5432/hello_world") ds.setUsername("benchmarkdbuser") ds.setPassword("benchmarkdbpass") - ds.setMaximumPoolSize(48) + ds.setMaximumPoolSize(Runtime.getRuntime().availableProcessors() * 2 + 1) private val squeryContext = SqueryContext(ds) def getRandomWorld(): WorldRow = squeryContext.run { diff --git a/frameworks/Scala/sharaf/src/main.scala b/frameworks/Scala/sharaf/src/main.scala index a562900fd04..13207509600 100644 --- a/frameworks/Scala/sharaf/src/main.scala +++ b/frameworks/Scala/sharaf/src/main.scala @@ -7,6 +7,8 @@ import ba.sake.sharaf.* @main def run(): Unit = { val dao = DAO() val benchmarkRoutes = BenchmarkRoutes(dao) + // set to slf4j, thus disabling logging (slf4j-nop) + System.setProperty("org.jboss.logging.provider", "slf4j") val server = Undertow .builder() .addHttpListener(8080, "0.0.0.0") @@ -18,5 +20,5 @@ import ba.sake.sharaf.* .setServerOption(UndertowOptions.ALWAYS_SET_KEEP_ALIVE, false) .build() server.start() - println(s"Started HTTP server at localhost:8080") + //println(s"Started HTTP server at localhost:8080") }