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

+str #17298 include stream supervisor in log() source

Browse source
This commit is contained in:
Konrad Malawski 2015-05-27 00:27:05 +02:00
parent 454a393af1
commit 778e6ce3d2
4 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,22 +4,17 @@
package akka.stream.impl.fusing
import akka.event.Logging.LogLevel
import akka.event.Logging
import akka.event.LoggingAdapter
import akka.event.{ LogSource, Logging, LoggingAdapter }
import akka.stream.OperationAttributes.LogLevels
import akka.stream.impl.FixedSizeBuffer
import akka.stream.impl.ReactiveStreamsCompliance
import akka.stream.impl.{ FixedSizeBuffer, ReactiveStreamsCompliance }
import akka.stream.stage._
import akka.stream.Supervision
import akka.stream._
import akka.stream.{ Supervision, _ }
import scala.annotation.tailrec
import scala.collection.immutable
import scala.concurrent.Future
import scala.util.control.NonFatal
import scala.util.Failure
import scala.util.Success
import scala.util.Try
import scala.util.{ Failure, Success, Try }
/**
* INTERNAL API
@ -540,7 +535,15 @@ private[akka] final case class Log[T](name: String, extract: T ⇒ Any, logAdapt
logLevels = ctx.attributes.logLevels.getOrElse(DefaultLogLevels)
log = logAdapter match {
case Some(l) ⇒ l
case _ ⇒ Logging(ctx.materializer.asInstanceOf[ActorFlowMaterializer].system, DefaultLoggerName)
case _ ⇒
val mat = try ActorFlowMaterializer.downcast(ctx.materializer)
catch {
case ex: Exception ⇒
throw new RuntimeException("Log stage can only provide LoggingAdapter when used with ActorFlowMaterializer! " +
"Provide a LoggingAdapter explicitly or use the actor based flow materializer.", ex)
}
Logging(mat.system, ctx)(fromLifecycleContext)
}
}
@ -583,8 +586,26 @@ private[akka] final case class Log[T](name: String, extract: T ⇒ Any, logAdapt
* INTERNAL API
*/
private[akka] object Log {
private final val DefaultLoggerName = "akka.stream.Log"
/**
* Must be located here to be visible for implicit resolution, when LifecycleContext is passed to [[Logging]]
* More specific LogSource than `fromString`, which would add the ActorSystem name in addition to the supervision to the log source.
*/
final val fromLifecycleContext = new LogSource[LifecycleContext] {
// do not expose private context classes (of OneBoundedInterpreter)
override def getClazz(t: LifecycleContext): Class[_] = classOf[FlowMaterializer]
override def genString(t: LifecycleContext): String = {
try s"$DefaultLoggerName(${ActorFlowMaterializer.downcast(t.materializer).supervisor.path})"
catch {
case ex: Exception ⇒ LogSource.fromString.genString(DefaultLoggerName)
}
}
}
private final val DefaultLoggerName = "akka.stream.Log"
private final val OffInt = LogLevels.Off.asInt
private final val DefaultLogLevels = LogLevels(onElement = Logging.DebugLevel, onFinish = Logging.DebugLevel, onFailure = Logging.ErrorLevel)
}