raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Deprecate actor materializer (#27538)

Browse source
This commit is contained in:
Johan Andrén 2019-09-05 16:08:37 +02:00 • committed by GitHub
parent 8765a4fbe6
commit b68d67008a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
118 changed files with 1233 additions and 731 deletions
Download patch file Download diff file Expand all files Collapse all files

13
akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala
View file

@ -1451,16 +1451,7 @@ private[stream] object Collect {
log = logAdapter match {
case Some(l) => l
case _ =>
val mat = try ActorMaterializerHelper.downcast(materializer)
catch {
case ex: Exception =>
throw new RuntimeException(
"Log stage can only provide LoggingAdapter when used with ActorMaterializer! " +
"Provide a LoggingAdapter explicitly or use the actor based flow materializer.",
ex)
}
Logging(mat.system, mat)(fromMaterializer)
Logging(materializer.system, materializer)(fromMaterializer)
}
}
@ -1538,7 +1529,7 @@ private[stream] object Collect {
override def getClazz(t: Materializer): Class[_] = classOf[Materializer]
override def genString(t: Materializer): String = {
try s"$DefaultLoggerName(${ActorMaterializerHelper.downcast(t).supervisor.path})"
try s"$DefaultLoggerName(${t.supervisor.path})"
catch {
case _: Exception => LogSource.fromString.genString(DefaultLoggerName)
}