Bump akka to 2.6.12

[controller.git] / akka / repackaged-akka-jar / src / main / resources / stream_reference.conf

diff --git a/akka/repackaged-akka-jar/src/main/resources/stream_reference.conf b/akka/repackaged-akka-jar/src/main/resources/stream_reference.conf
index a29e83a9f7527fc1af5d5c353f146a995c965521..dd982714a17af35b7ec03f13818a4a97be70dff9 100644 (file)
--- a/akka/repackaged-akka-jar/src/main/resources/stream_reference.conf
+++ b/akka/repackaged-akka-jar/src/main/resources/stream_reference.conf
@@ -2,6 +2,8 @@
 # Akka Stream Reference Config File #
 #####################################
 
+# eager creation of the system wide materializer
+akka.library-extensions += "akka.stream.SystemMaterializer$"
 akka {
   stream {
 
@@ -14,11 +16,13 @@ akka {
       max-input-buffer-size = 16
 
       # Fully qualified config path which holds the dispatcher configuration
-      # to be used by ActorMaterializer when creating Actors.
-      # When this value is left empty, the default-dispatcher will be used.
-      dispatcher = ""
+      # or full dispatcher configuration to be used by ActorMaterializer when creating Actors.
+      dispatcher = "akka.actor.default-dispatcher"
 
-      blocking-io-dispatcher = "akka.stream.default-blocking-io-dispatcher"
+      # Fully qualified config path which holds the dispatcher configuration
+      # or full dispatcher configuration to be used by stream operators that
+      # perform blocking operations
+      blocking-io-dispatcher = "akka.actor.default-blocking-io-dispatcher"
 
       # Cleanup leaked publishers and subscribers when they are not used within a given
       # deadline
@@ -76,7 +80,7 @@ akka {
       }
 
       io.tcp {
-        # The outgoing bytes are accumulated in a buffer while waiting for acknoledgment
+        # The outgoing bytes are accumulated in a buffer while waiting for acknowledgment
         # of pending write. This improves throughput for small messages (frames) without
         # sacrificing latency. While waiting for the ack the stage will eagerly pull
         # from upstream until the buffer exceeds this size. That means that the buffer may hold
@@ -85,6 +89,9 @@ akka {
         write-buffer-size = 16 KiB
       }
 
+      # Time to wait for async materializer creation before throwing an exception
+      creation-timeout = 20 seconds
+
       //#stream-ref
       # configure defaults for SourceRef and SinkRef
       stream-ref {
@@ -122,21 +129,12 @@ akka {
       //#stream-ref
     }
 
-    # Deprecated, use akka.stream.materializer.blocking-io-dispatcher, this setting
-    # was never applied because of bug #24357
-    # It must still have a valid value because used from Akka HTTP.
-    blocking-io-dispatcher = "akka.stream.default-blocking-io-dispatcher"
-
-    default-blocking-io-dispatcher {
-      type = "Dispatcher"
-      executor = "thread-pool-executor"
-      throughput = 1
-
-      thread-pool-executor {
-        fixed-pool-size = 16
-      }
-    }
+    # Deprecated, left here to not break Akka HTTP which refers to it
+    blocking-io-dispatcher = "akka.actor.default-blocking-io-dispatcher"
 
+    # Deprecated, will not be used unless user code refer to it, use 'akka.stream.materializer.blocking-io-dispatcher'
+    # instead, or if from code, prefer the 'ActorAttributes.IODispatcher' attribute
+    default-blocking-io-dispatcher = "akka.actor.default-blocking-io-dispatcher"
   }
 
   # configure overrides to ssl-configuration here (to be used by akka-streams, and akka-http – i.e. when serving https connections)