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

Fixing so that the 0MQ tests will run on 0mq 3 and removed some boiler from RemoteClientLifeCycleEvent

Browse source
This commit is contained in:
Viktor Klang 2012-09-21 16:22:57 +02:00
parent a132bb5deb
commit 750f430bab
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
akka-remote/src/main/scala/akka/remote/RemoteTransport.scala
View file

@ -24,6 +24,7 @@ sealed trait RemoteLifeCycleEvent extends Serializable {
*/ */
trait RemoteClientLifeCycleEvent extends RemoteLifeCycleEvent { trait RemoteClientLifeCycleEvent extends RemoteLifeCycleEvent {
def remoteAddress: Address def remoteAddress: Address
final def getRemoteAddress: Address = remoteAddress
} }
/** /**
@ -31,8 +32,8 @@ trait RemoteClientLifeCycleEvent extends RemoteLifeCycleEvent {
*/ */
case class RemoteClientError( case class RemoteClientError(
@BeanProperty cause: Throwable, @BeanProperty cause: Throwable,
@transient @BeanProperty remote: RemoteTransport, @transient remote: RemoteTransport,
@BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { remoteAddress: Address) extends RemoteClientLifeCycleEvent {
override def logLevel: Logging.LogLevel = Logging.ErrorLevel override def logLevel: Logging.LogLevel = Logging.ErrorLevel
override def toString: String = "RemoteClientError@" + remoteAddress + ": Error[" + Logging.stackTraceFor(cause) + "]" override def toString: String = "RemoteClientError@" + remoteAddress + ": Error[" + Logging.stackTraceFor(cause) + "]"
} }
@ -42,7 +43,7 @@ case class RemoteClientError(
*/ */
case class RemoteClientDisconnected( case class RemoteClientDisconnected(
@transient @BeanProperty remote: RemoteTransport, @transient @BeanProperty remote: RemoteTransport,
@BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { remoteAddress: Address) extends RemoteClientLifeCycleEvent {
override def logLevel: Logging.LogLevel = Logging.DebugLevel override def logLevel: Logging.LogLevel = Logging.DebugLevel
override def toString: String = "RemoteClientDisconnected@" + remoteAddress override def toString: String = "RemoteClientDisconnected@" + remoteAddress
} }
@ -52,7 +53,7 @@ case class RemoteClientDisconnected(
*/ */
case class RemoteClientConnected( case class RemoteClientConnected(
@transient @BeanProperty remote: RemoteTransport, @transient @BeanProperty remote: RemoteTransport,
@BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { remoteAddress: Address) extends RemoteClientLifeCycleEvent {
override def logLevel: Logging.LogLevel = Logging.DebugLevel override def logLevel: Logging.LogLevel = Logging.DebugLevel
override def toString: String = "RemoteClientConnected@" + remoteAddress override def toString: String = "RemoteClientConnected@" + remoteAddress
} }
@ -62,7 +63,7 @@ case class RemoteClientConnected(
*/ */
case class RemoteClientStarted( case class RemoteClientStarted(
@transient @BeanProperty remote: RemoteTransport, @transient @BeanProperty remote: RemoteTransport,
@BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { remoteAddress: Address) extends RemoteClientLifeCycleEvent {
override def logLevel: Logging.LogLevel = Logging.InfoLevel override def logLevel: Logging.LogLevel = Logging.InfoLevel
override def toString: String = "RemoteClientStarted@" + remoteAddress override def toString: String = "RemoteClientStarted@" + remoteAddress
} }
@ -72,7 +73,7 @@ case class RemoteClientStarted(
*/ */
case class RemoteClientShutdown( case class RemoteClientShutdown(
@transient @BeanProperty remote: RemoteTransport, @transient @BeanProperty remote: RemoteTransport,
@BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { remoteAddress: Address) extends RemoteClientLifeCycleEvent {
override def logLevel: Logging.LogLevel = Logging.InfoLevel override def logLevel: Logging.LogLevel = Logging.InfoLevel
override def toString: String = "RemoteClientShutdown@" + remoteAddress override def toString: String = "RemoteClientShutdown@" + remoteAddress
} }

4
akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
View file

@ -18,8 +18,8 @@ class ConcurrentSocketActorSpec extends AkkaSpec {
def checkZeroMQInstallation = def checkZeroMQInstallation =
try { try {
zmq.version match { zmq.version match {
case ZeroMQVersion(2, 1, _) ⇒ Unit case ZeroMQVersion(x, y, _) if x >= 3 || (x >= 2 && y >= 1) ⇒ Unit
case version ⇒ invalidZeroMQVersion(version) case version ⇒ invalidZeroMQVersion(version)
} }
} catch { } catch {
case e: LinkageError ⇒ zeroMQNotInstalled case e: LinkageError ⇒ zeroMQNotInstalled