diff --git a/akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala index e98603f8a6..8785f0f7dc 100644 --- a/akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala @@ -116,12 +116,11 @@ class ExecutorBasedEventDrivenDispatcher( } } - private[akka] def start = log.slf4j.debug("Starting up {}\n\twith throughput [{}]", this, throughput) + private[akka] def start {} private[akka] def shutdown { val old = executorService.getAndSet(config.createLazyExecutorService(threadFactory)) if (old ne null) { - log.slf4j.debug("Shutting down {}", this) old.shutdownNow() } } @@ -137,7 +136,6 @@ class ExecutorBasedEventDrivenDispatcher( } } } - else log.slf4j.warn("{} is shut down,\n\tignoring the rest of the messages in the mailbox of\n\t{}", this, mbox) private[akka] def reRegisterForExecution(mbox: MessageQueue with ExecutableMailbox): Unit = registerForExecution(mbox) @@ -145,12 +143,10 @@ class ExecutorBasedEventDrivenDispatcher( override val toString = getClass.getSimpleName + "[" + name + "]" def suspend(actorRef: ActorRef) { - log.slf4j.debug("Suspending {}",actorRef.uuid) getMailbox(actorRef).suspended.tryLock } def resume(actorRef: ActorRef) { - log.slf4j.debug("Resuming {}",actorRef.uuid) val mbox = getMailbox(actorRef) mbox.suspended.tryUnlock reRegisterForExecution(mbox) diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala index 63b68e262c..7efdf549b5 100644 --- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala +++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala @@ -36,7 +36,7 @@ object MessageDispatcher { /** * @author Jonas Bonér */ -trait MessageDispatcher extends Logging { +trait MessageDispatcher { import MessageDispatcher._ protected val uuids = new ConcurrentSkipListSet[Uuid] @@ -106,7 +106,6 @@ trait MessageDispatcher extends Logging { Actor.registry.actorFor(uuid) match { case Some(actor) => actor.stop case None => - log.slf4j.error("stopAllLinkedActors couldn't find linked actor: " + uuid) } } }