Remove unnecessary akka configuration

pityka · Nov 1, 2023 · 2b3e9d8 · 2b3e9d8
1 parent a523c5c
commit 2b3e9d8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/core/src/main/resources/akka.conf b/core/src/main/resources/akka.conf
@@ -37,11 +37,6 @@ proxytask-dispatcher {
  executor = "fork-join-executor"
 }
 
-task-worker-dispatcher {
- type = Dispatcher
- executor = "fork-join-executor"
-}
-
 akka.remote.watch-failure-detector.acceptable-heartbeat-pause = 300 s
 
 akka.http.host-connection-pool.max-open-requests = 1048576
@@ -82,17 +77,7 @@ akka.actor {
 
  serialize-messages = off
 
- serializers {
- static = "tasks.wire.StaticMessageSerializer"
- sch = "tasks.wire.ScheduleTaskSerializer"
- sf = "tasks.wire.SharedFileSerializer"
- }
-
- serialization-bindings {
- "tasks.wire.StaticMessage" = static
- "tasks.queue.ScheduleTask" = sch
- "tasks.fileservice.SharedFile" = sf
- }
+
 
 }
 
diff --git a/core/src/main/scala/tasks/TaskSystemComponents.scala b/core/src/main/scala/tasks/TaskSystemComponents.scala
@@ -660,13 +660,29 @@ object TaskSystemComponents {
  case _ => "akka.remote.RemoteActorRefProvider"
  }
 
+ val serializers = hostConfig match {
+ case _: LocalConfiguration => ""
+ case _ => """
+ serializers {
+ static = "tasks.wire.StaticMessageSerializer"
+ sch = "tasks.wire.ScheduleTaskSerializer"
+ sf = "tasks.wire.SharedFileSerializer"
+ }
+
+ serialization-bindings {
+ "tasks.wire.StaticMessage" = static
+ "tasks.queue.ScheduleTask" = sch
+ "tasks.fileservice.SharedFile" = sf
+ }
+ """
+ }
+
  val akkaProgrammaticalConfiguration = ConfigFactory.parseString(s"""
- task-worker-dispatcher.fork-join-executor.parallelism-max = ${hostConfig.availableCPU}
- task-worker-dispatcher.fork-join-executor.parallelism-min = ${hostConfig.availableCPU}
  
  akka {
  actor {
  provider = "${actorProvider}"
+ $serializers
  }
  remote {
  artery {
@@ -675,6 +691,10 @@ object TaskSystemComponents {
  }
  
  }
+
+ 
+
+
  }
  """)
 

diff --git a/core/src/main/scala/tasks/fileservice/SharedFileHelper.scala b/core/src/main/scala/tasks/fileservice/SharedFileHelper.scala
@@ -36,7 +36,6 @@ import tasks.queue._
 import cats.effect.kernel.Resource
 import cats.effect.IO
 import fs2.Stream
-import akka.stream.Materializer
 import fs2.Chunk
 
 private[tasks] object SharedFileHelper {
@@ -261,7 +260,6 @@ private[tasks] object SharedFileHelper {
  context: ActorRefFactory,
  config: TasksConfig,
  historyContext: HistoryContext,
- mat: Materializer
  ): IO[List[SharedFile]] = {
  val directory = service.storage
  .sharedFolder(prefix.list)