@@ -264,10 +264,10 @@ class GenericServerContainer(val id: String, var serverFactory: () => GenericSer */ private[behavior] def terminate(reason: AnyRef, shutdownTime: Int) = lock.withReadLock { if (shutdownTime > 0) { - log.debug("Waiting {} milliseconds for the server to shut down before killing it.", shutdownTime) + log.debug("Waiting %s milliseconds for the server to shut down before killing it.", shutdownTime) server !? (shutdownTime, Shutdown(reason)) match { - case Some('success) => log.debug("Server [{}] has been shut down cleanly.", id) - case None => log.warning("Server [{}] was **not able** to complete shutdown cleanly within its configured shutdown time [{}]", id, shutdownTime) + case Some('success) => log.debug("Server [%s] has been shut down cleanly.", id) + case None => log.warning("Server [%s] was **not able** to complete shutdown cleanly within its configured shutdown time [%s]", id, shutdownTime) } } server ! Terminate(reason) behavior/src/main/scala/scala/actors/behavior/GenericServer.scala @@ -92,7 +92,7 @@ object Helpers extends Logging { def receiveWithin(timeout: Int): Option[A] = value match { case None => ch.receiveWithin(timeout) { case TIMEOUT => - log.debug("Future timed out while waiting for actor: {}", a) + log.debug("Future timed out while waiting for actor: %s", a) None case a: A => value = Some(a) behavior/src/main/scala/scala/actors/behavior/Helpers.scala @@ -147,22 +147,22 @@ class Supervisor(faultHandler: FaultHandlingStrategy) extends Actor with Logging loop { react { case Configure(config, factory) => - log.debug("Configuring supervisor:{} ", this) + log.debug("Configuring supervisor:%s ", this) configure(config, factory) reply('success) case Start => state.serverContainers.foreach { serverContainer => serverContainer.start - log.info("Starting server: {}", serverContainer.getServer) + log.info("Starting server: %s", serverContainer.getServer) } case Stop => state.serverContainers.foreach { serverContainer => serverContainer.terminate('normal) - log.info("Stopping server: {}", serverContainer) + log.info("Stopping server: %s", serverContainer) } - log.info("Stopping supervisor: {}", this) + log.info("Stopping supervisor: %s", this) exit('normal) case Exit(failedServer, reason) => @@ -171,7 +171,7 @@ class Supervisor(faultHandler: FaultHandlingStrategy) extends Actor with Logging case _ => state.faultHandler.handleFailure(state, failedServer, reason) } - case unexpected => log.warning("Unexpected message [{}], ignoring...", unexpected) + case unexpected => log.warning("Unexpected message [%s], ignoring...", unexpected) } } } @@ -195,7 +195,7 @@ class Supervisor(faultHandler: FaultHandlingStrategy) extends Actor with Logging val newServer = serverContainer.newServer() newServer.start self.link(newServer) - log.debug("Linking actor [{}] to supervisor [{}]", newServer, this) + log.debug("Linking actor [%s] to supervisor [%s]", newServer, this) state.addServerContainer(serverContainer) newServer } @@ -216,7 +216,7 @@ abstract class FaultHandlingStrategy(val maxNrOfRetries: Int, val withinTimeRang nrOfRetries += 1 if (timeRangeHasExpired) { if (hasReachedMaximumNrOfRetries) { - log.info("Maximum of restarts [{}] for server [{}] has been reached - the supervisor including all its servers will now be shut down.", maxNrOfRetries, failedServer) + log.info("Maximum of restarts [%s] for server [%s] has been reached - the supervisor including all its servers will now be shut down.", maxNrOfRetries, failedServer) supervisor ! Stop // execution stops here } else { nrOfRetries = 0 @@ -242,17 +242,17 @@ abstract class FaultHandlingStrategy(val maxNrOfRetries: Int, val withinTimeRang scope match { case Permanent => - log.debug("Restarting server [{}] configured as PERMANENT.", serverContainer.id) + log.debug("Restarting server [%s] configured as PERMANENT.", serverContainer.id) serverContainer.reconfigure(reason, supervisor.spawnLink(serverContainer), state.supervisor) case Temporary => if (reason == 'normal) { - log.debug("Restarting server [{}] configured as TEMPORARY (since exited naturally).", serverContainer.id) + log.debug("Restarting server [%s] configured as TEMPORARY (since exited naturally).", serverContainer.id) serverContainer.reconfigure(reason, supervisor.spawnLink(serverContainer), state.supervisor) - } else log.info("Server [{}] configured as TEMPORARY will not be restarted (received unnatural exit message).", serverContainer.id) + } else log.info("Server [%s] configured as TEMPORARY will not be restarted (received unnatural exit message).", serverContainer.id) case Transient => - log.info("Server [{}] configured as TRANSIENT will not be restarted.", serverContainer.id) + log.info("Server [%s] configured as TRANSIENT will not be restarted.", serverContainer.id) } } } @@ -288,7 +288,7 @@ abstract class FaultHandlingStrategy(val maxNrOfRetries: Int, val withinTimeRang class AllForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy(maxNrOfRetries, withinTimeRange) { override def doHandleFailure(state: SupervisorState, failedServer: AbstractActor, reason: AnyRef) = { - log.error("Server [{}] has failed due to [{}] - scheduling restart - scheme: ALL_FOR_ONE.", failedServer, reason) + log.error("Server [%s] has failed due to [%s] - scheduling restart - scheme: ALL_FOR_ONE.", failedServer, reason) for (serverContainer <- state.serverContainers) restart(serverContainer, reason, state) state.supervisors.foreach(_ ! Exit(failedServer, reason)) } @@ -303,7 +303,7 @@ extends FaultHandlingStrategy(maxNrOfRetries, withinTimeRange) { class OneForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy(maxNrOfRetries, withinTimeRange) { override def doHandleFailure(state: SupervisorState, failedServer: AbstractActor, reason: AnyRef) = { - log.error("Server [{}] has failed due to [{}] - scheduling restart - scheme: ONE_FOR_ONE.", failedServer, reason) + log.error("Server [%s] has failed due to [%s] - scheduling restart - scheme: ONE_FOR_ONE.", failedServer, reason) var serverContainer: Option[GenericServerContainer] = None state.serverContainers.foreach { container => if (container.getServer == failedServer) serverContainer = Some(container) behavior/src/main/scala/scala/actors/behavior/Supervisor.scala @@ -92,7 +92,7 @@ <dependency> <groupId>net.lag</groupId> <artifactId>configgy</artifactId> - <version>1.1</version> + <version>1.2</version> </dependency> <dependency> <groupId>commons-lang</groupId> pom.xml c4bfc676a398475c1cf2dc1c04ec45d2127b6878 Jonas Boner jonas@jonasboner.com http://github.com/jboner/scala-otp/commit/8eeddfea06d01de0d04157056db165733adcd796 8eeddfea06d01de0d04157056db165733adcd796 2009-02-17T10:48:04-08:00 2009-02-17T10:48:04-08:00 fixed broken logging ff0a2735098429a9a9d5aafe7ceeb3525f940db3 Jonas Boner jonas@jonasboner.com