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

Changed API for EventHandler and added support for log levels

Browse source
This commit is contained in:
Jonas Bonér 2011-03-14 10:45:49 +01:00
parent 39caa297ac
commit f8ce3d541e
16 changed files with 69 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

37
akka-actor/src/main/scala/akka/actor/Actor.scala
View file

@ -97,7 +97,11 @@ class ActorTimeoutException private[akka](message: String) extends AkkaEx
* *
* Log an error event: * Log an error event:
* <pre> * <pre>
* EventHandler.notifyListeners(EventHandler.Error(exception, this, message.toString)) * EventHandler.notify(EventHandler.Error(exception, this, message.toString))
* </pre>
* Or use the direct methods (better performance):
* <pre>
* EventHandler.error(exception, this, message.toString)
* </pre> * </pre>
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/ */
@ -114,7 +118,7 @@ object EventHandler extends ListenerManagement {
case class Warning(instance: AnyRef, message: String = "") extends Event case class Warning(instance: AnyRef, message: String = "") extends Event
case class Info(instance: AnyRef, message: String = "") extends Event case class Info(instance: AnyRef, message: String = "") extends Event
case class Debug(instance: AnyRef, message: String = "") extends Event case class Debug(instance: AnyRef, message: String = "") extends Event
val error = "[ERROR] [%s] [%s] [%s] %s\n%s".intern val error = "[ERROR] [%s] [%s] [%s] %s\n%s".intern
val warning = "[WARN] [%s] [%s] [%s] %s".intern val warning = "[WARN] [%s] [%s] [%s] %s".intern
val info = "[INFO] [%s] [%s] [%s] %s".intern val info = "[INFO] [%s] [%s] [%s] %s".intern
@ -123,6 +127,35 @@ object EventHandler extends ListenerManagement {
val EventHandlerDispatcher = Dispatchers.newExecutorBasedEventDrivenDispatcher(ID).build val EventHandlerDispatcher = Dispatchers.newExecutorBasedEventDrivenDispatcher(ID).build
val level: Class[_ <: Event] = config.getString("akka.event-handler-level", "DEBUG") match {
case "ERROR" => classOf[Error]
case "WARNING" => classOf[Warning]
case "INFO" => classOf[Info]
case "DEBUG" => classOf[Debug]
case unknown => throw new ConfigurationException(
"Configuration option 'akka.event-handler-level' is invalid [" + unknown + "]")
}
def notify[T <: Event : ClassManifest](event: => T) {
if (classManifest[T].erasure.asInstanceOf[Class[_ <: Event]] == level) notifyListeners(event)
}
def error(cause: Throwable, instance: AnyRef, message: => String) = {
if (level == classOf[Error]) notifyListeners(Error(cause, instance, message))
}
def warning(instance: AnyRef, message: => String) = {
if (level == classOf[Warning]) notifyListeners(Warning(instance, message))
}
def info(instance: AnyRef, message: => String) = {
if (level == classOf[Info]) notifyListeners(Info(instance, message))
}
def debug(instance: AnyRef, message: => String) = {
if (level == classOf[Debug]) notifyListeners(Debug(instance, message))
}
def formattedTimestamp = DateFormat.getInstance.format(new Date) def formattedTimestamp = DateFormat.getInstance.format(new Date)
def stackTraceFor(e: Throwable) = { def stackTraceFor(e: Throwable) = {

4
akka-actor/src/main/scala/akka/actor/ActorRef.scala
View file

@ -824,7 +824,7 @@ class LocalActorRef private[akka] (
} }
} catch { } catch {
case e: Throwable => case e: Throwable =>
EventHandler notifyListeners EventHandler.Error(e, this, messageHandle.message.toString) EventHandler notify EventHandler.Error(e, this, messageHandle.message.toString)
throw e throw e
} }
} }
@ -987,7 +987,7 @@ class LocalActorRef private[akka] (
} }
private def handleExceptionInDispatch(reason: Throwable, message: Any) = { private def handleExceptionInDispatch(reason: Throwable, message: Any) = {
EventHandler notifyListeners EventHandler.Error(reason, this, message.toString) EventHandler notify EventHandler.Error(reason, this, message.toString)
//Prevent any further messages to be processed until the actor has been restarted //Prevent any further messages to be processed until the actor has been restarted
dispatcher.suspend(this) dispatcher.suspend(this)

8
akka-actor/src/main/scala/akka/actor/Scheduler.scala
View file

@ -38,7 +38,7 @@ object Scheduler {
initialDelay, delay, timeUnit).asInstanceOf[ScheduledFuture[AnyRef]] initialDelay, delay, timeUnit).asInstanceOf[ScheduledFuture[AnyRef]]
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this, receiver + " @ " + message) EventHandler notify EventHandler.Error(e, this, receiver + " @ " + message)
throw SchedulerException(message + " could not be scheduled on " + receiver, e) throw SchedulerException(message + " could not be scheduled on " + receiver, e)
} }
} }
@ -59,7 +59,7 @@ object Scheduler {
service.scheduleAtFixedRate(runnable, initialDelay, delay, timeUnit).asInstanceOf[ScheduledFuture[AnyRef]] service.scheduleAtFixedRate(runnable, initialDelay, delay, timeUnit).asInstanceOf[ScheduledFuture[AnyRef]]
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
throw SchedulerException("Failed to schedule a Runnable", e) throw SchedulerException("Failed to schedule a Runnable", e)
} }
} }
@ -74,7 +74,7 @@ object Scheduler {
delay, timeUnit).asInstanceOf[ScheduledFuture[AnyRef]] delay, timeUnit).asInstanceOf[ScheduledFuture[AnyRef]]
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this, receiver + " @ " + message) EventHandler notify EventHandler.Error(e, this, receiver + " @ " + message)
throw SchedulerException( message + " could not be scheduleOnce'd on " + receiver, e) throw SchedulerException( message + " could not be scheduleOnce'd on " + receiver, e)
} }
} }
@ -95,7 +95,7 @@ object Scheduler {
service.schedule(runnable,delay, timeUnit).asInstanceOf[ScheduledFuture[AnyRef]] service.schedule(runnable,delay, timeUnit).asInstanceOf[ScheduledFuture[AnyRef]]
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
throw SchedulerException("Failed to scheduleOnce a Runnable", e) throw SchedulerException("Failed to scheduleOnce a Runnable", e)
} }
} }

2
akka-actor/src/main/scala/akka/config/Config.scala
View file

@ -77,7 +77,7 @@ object Config {
} }
} catch { } catch {
case e => case e =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
throw e throw e
} }
} }

2
akka-actor/src/main/scala/akka/dataflow/DataFlow.scala
View file

@ -148,7 +148,7 @@ object DataFlow {
(out !! Get).as[T] (out !! Get).as[T]
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
out ! Exit out ! Exit
throw e throw e
} }

4
akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala
View file

@ -102,7 +102,7 @@ class ExecutorBasedEventDrivenDispatcher(
try executorService.get() execute invocation try executorService.get() execute invocation
catch { catch {
case e: RejectedExecutionException => case e: RejectedExecutionException =>
EventHandler notifyListeners EventHandler.Warning(this, e.toString) EventHandler notify EventHandler.Warning(this, e.toString)
throw e throw e
} }
} }
@ -141,7 +141,7 @@ class ExecutorBasedEventDrivenDispatcher(
executorService.get() execute mbox executorService.get() execute mbox
} catch { } catch {
case e: RejectedExecutionException => case e: RejectedExecutionException =>
EventHandler notifyListeners EventHandler.Warning(this, e.toString) EventHandler notify EventHandler.Warning(this, e.toString)
mbox.dispatcherLock.unlock() mbox.dispatcherLock.unlock()
throw e throw e
} }

8
akka-actor/src/main/scala/akka/dispatch/Future.scala
View file

@ -90,7 +90,7 @@ object Futures {
result completeWithResult r result completeWithResult r
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
result completeWithException e result completeWithException e
} }
} }
@ -258,7 +258,7 @@ sealed trait Future[T] {
Right(f(v.right.get)) Right(f(v.right.get))
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
Left(e) Left(e)
}) })
} }
@ -286,7 +286,7 @@ sealed trait Future[T] {
f(v.right.get) onComplete (fa.completeWith(_)) f(v.right.get) onComplete (fa.completeWith(_))
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
fa completeWithException e fa completeWithException e
} }
} }
@ -316,7 +316,7 @@ sealed trait Future[T] {
else Left(new MatchError(r)) else Left(new MatchError(r))
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
Left(e) Left(e)
}) })
} }

2
akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
View file

@ -36,7 +36,7 @@ final case class FutureInvocation(future: CompletableFuture[Any], function: () =
Right(function.apply) Right(function.apply)
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
Left(e) Left(e)
}) })
} }

4
akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
View file

@ -208,10 +208,10 @@ class BoundedExecutorDecorator(val executor: ExecutorService, bound: Int) extend
}) })
} catch { } catch {
case e: RejectedExecutionException => case e: RejectedExecutionException =>
EventHandler notifyListeners EventHandler.Warning(this, e.toString) EventHandler notify EventHandler.Warning(this, e.toString)
semaphore.release semaphore.release
case e: Throwable => case e: Throwable =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
throw e throw e
} }
} }

2
akka-actor/src/main/scala/akka/routing/Pool.scala
View file

@ -84,7 +84,7 @@ trait DefaultActorPool extends ActorPool
future completeWithResult (delegate !! msg).getOrElse(None) future completeWithResult (delegate !! msg).getOrElse(None)
} catch { } catch {
case e => case e =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
future completeWithException e future completeWithException e
} }
} }

2
akka-actor/src/main/scala/akka/util/LockUtil.scala
View file

@ -126,7 +126,7 @@ class Switch(startAsOn: Boolean = false) {
action action
} catch { } catch {
case t: Throwable => case t: Throwable =>
EventHandler notifyListeners EventHandler.Error(t, this) EventHandler notify EventHandler.Error(t, this)
switch.compareAndSet(!from, from) //Revert status switch.compareAndSet(!from, from) //Revert status
throw t throw t
} }

4
akka-http/src/main/scala/akka/http/Mist.scala
View file

@ -389,7 +389,7 @@ trait RequestMethod {
} }
} catch { } catch {
case io: Exception => case io: Exception =>
EventHandler notifyListeners EventHandler.Error(io, this) EventHandler notify EventHandler.Error(io, this)
false false
} }
} }
@ -408,7 +408,7 @@ trait RequestMethod {
} }
} catch { } catch {
case io: IOException => case io: IOException =>
EventHandler notifyListeners EventHandler.Error(io, this) EventHandler notify EventHandler.Error(io, this)
} }
} }

2
akka-http/src/main/scala/akka/http/Servlet30Context.scala
View file

@ -36,7 +36,7 @@ trait Servlet30Context extends AsyncListener {
} }
catch { catch {
case ex: IllegalStateException => case ex: IllegalStateException =>
EventHandler notifyListeners EventHandler.Error(ex, this) EventHandler notify EventHandler.Error(ex, this)
false false
} }
} }

2
akka-http/src/main/scala/akka/security/Security.scala
View file

@ -369,7 +369,7 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] {
Some(UserInfo(user, null, rolesFor(user))) Some(UserInfo(user, null, rolesFor(user)))
} catch { } catch {
case e: PrivilegedActionException => { case e: PrivilegedActionException => {
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
None None
} }
} }

20
akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
View file

@ -445,7 +445,7 @@ class ActiveRemoteClientHandler(
} }
} catch { } catch {
case e: Throwable => case e: Throwable =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
client.notifyListeners(RemoteClientError(e, client.module, client.remoteAddress)) client.notifyListeners(RemoteClientError(e, client.module, client.remoteAddress))
throw e throw e
} }
@ -502,7 +502,7 @@ class ActiveRemoteClientHandler(
.newInstance(exception.getMessage).asInstanceOf[Throwable] .newInstance(exception.getMessage).asInstanceOf[Throwable]
} catch { } catch {
case problem: Throwable => case problem: Throwable =>
EventHandler notifyListeners EventHandler.Error(problem, this) EventHandler notify EventHandler.Error(problem, this)
UnparsableException(classname, exception.getMessage) UnparsableException(classname, exception.getMessage)
} }
} }
@ -582,7 +582,7 @@ class NettyRemoteServer(serverModule: NettyRemoteServerModule, val host: String,
serverModule.notifyListeners(RemoteServerShutdown(serverModule)) serverModule.notifyListeners(RemoteServerShutdown(serverModule))
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
} }
} }
} }
@ -614,7 +614,7 @@ trait NettyRemoteServerModule extends RemoteServerModule { self: RemoteModule =>
} }
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
notifyListeners(RemoteServerError(e, this)) notifyListeners(RemoteServerError(e, this))
} }
this this
@ -923,7 +923,7 @@ class RemoteServerHandler(
val actorRef = val actorRef =
try { createActor(actorInfo, channel).start } catch { try { createActor(actorInfo, channel).start } catch {
case e: SecurityException => case e: SecurityException =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
write(channel, createErrorReplyMessage(e, request, AkkaActorType.ScalaActor)) write(channel, createErrorReplyMessage(e, request, AkkaActorType.ScalaActor))
server.notifyListeners(RemoteServerError(e, server)) server.notifyListeners(RemoteServerError(e, server))
return return
@ -1011,7 +1011,7 @@ class RemoteServerHandler(
write(channel, RemoteEncoder.encode(messageBuilder.build)) write(channel, RemoteEncoder.encode(messageBuilder.build))
} catch { } catch {
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
server.notifyListeners(RemoteServerError(e, server)) server.notifyListeners(RemoteServerError(e, server))
} }
@ -1027,11 +1027,11 @@ class RemoteServerHandler(
} }
} catch { } catch {
case e: InvocationTargetException => case e: InvocationTargetException =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
write(channel, createErrorReplyMessage(e.getCause, request, AkkaActorType.TypedActor)) write(channel, createErrorReplyMessage(e.getCause, request, AkkaActorType.TypedActor))
server.notifyListeners(RemoteServerError(e, server)) server.notifyListeners(RemoteServerError(e, server))
case e: Exception => case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
write(channel, createErrorReplyMessage(e, request, AkkaActorType.TypedActor)) write(channel, createErrorReplyMessage(e, request, AkkaActorType.TypedActor))
server.notifyListeners(RemoteServerError(e, server)) server.notifyListeners(RemoteServerError(e, server))
} }
@ -1091,7 +1091,7 @@ class RemoteServerHandler(
actorRef actorRef
} catch { } catch {
case e: Throwable => case e: Throwable =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
server.notifyListeners(RemoteServerError(e, server)) server.notifyListeners(RemoteServerError(e, server))
throw e throw e
} }
@ -1158,7 +1158,7 @@ class RemoteServerHandler(
newInstance newInstance
} catch { } catch {
case e: Throwable => case e: Throwable =>
EventHandler notifyListeners EventHandler.Error(e, this) EventHandler notify EventHandler.Error(e, this)
server.notifyListeners(RemoteServerError(e, server)) server.notifyListeners(RemoteServerError(e, server))
throw e throw e
} }

1
config/akka-reference.conf
View file

@ -13,6 +13,7 @@ akka {
time-unit = "seconds" # Time unit for all timeout properties throughout the config time-unit = "seconds" # Time unit for all timeout properties throughout the config
event-handlers = ["akka.actor.EventHandler$DefaultListener"] # event handlers to register at boot time (EventHandler$DefaultListener logs to STDOUT) event-handlers = ["akka.actor.EventHandler$DefaultListener"] # event handlers to register at boot time (EventHandler$DefaultListener logs to STDOUT)
event-handler-level = "DEBUG" # Options: ERROR, WARING, INFO, DEBUG
# These boot classes are loaded (and created) automatically when the Akka Microkernel boots up # These boot classes are loaded (and created) automatically when the Akka Microkernel boots up
# Can be used to bootstrap your application(s) # Can be used to bootstrap your application(s)