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

fixes #20414 Allow different ActorMaterializer subtypes

Browse source
This commit is contained in:
Kam Kasravi 2016-05-03 18:58:26 -07:00
parent 47c1b5b9ad
commit 049b95077f
21 changed files with 114 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -922,7 +922,7 @@ private[akka] final case class Log[T](name: String, extract: T ⇒ Any,
log = logAdapter match {
case Some(l) ⇒ l
case _ ⇒
val mat = try ActorMaterializer.downcast(ctx.materializer)
val mat = try ActorMaterializerHelper.downcast(ctx.materializer)
catch {
case ex: Exception ⇒
throw new RuntimeException("Log stage can only provide LoggingAdapter when used with ActorMaterializer! " +
@ -984,7 +984,7 @@ private[akka] object Log {
override def getClazz(t: LifecycleContext): Class[_] = classOf[Materializer]
override def genString(t: LifecycleContext): String = {
try s"$DefaultLoggerName(${ActorMaterializer.downcast(t.materializer).supervisor.path})"
try s"$DefaultLoggerName(${ActorMaterializerHelper.downcast(t.materializer).supervisor.path})"
catch {
case ex: Exception ⇒ LogSource.fromString.genString(DefaultLoggerName)
}