From 9e16c02b0d62f366d4546296fb373a875c5a3376 Mon Sep 17 00:00:00 2001 From: Yoel Garcia Diaz Date: Thu, 7 Mar 2019 06:58:28 +0000 Subject: [PATCH 1/8] fix login the bind address when remoting starts --- .../src/main/scala/akka/remote/artery/ArteryTransport.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala index b9de479aef..6a368599f5 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala @@ -461,7 +461,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr log.info( "Remoting started with transport [Artery {}]; listening on address [{}] with UID [{}]", - settings.Transport, localAddress.address, localAddress.uid) + settings.Transport, bindAddress.address, bindAddress.uid) } protected def startTransport(): Unit From b2fcc9f1b0a5a775417845f6032b758cfa34162c Mon Sep 17 00:00:00 2001 From: Yoel Garcia Diaz Date: Thu, 7 Mar 2019 08:03:39 +0000 Subject: [PATCH 2/8] log both listening and binding addresses if they are different --- .../akka/remote/artery/ArteryTransport.scala | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala index 6a368599f5..3374b63e62 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala @@ -458,10 +458,19 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr topLevelFlightRecorder.loFreq(Transport_StartupFinished, NoMetaData) startRemoveQuarantinedAssociationTask() - - log.info( - "Remoting started with transport [Artery {}]; listening on address [{}] with UID [{}]", - settings.Transport, bindAddress.address, bindAddress.uid) + + if (localAddress.address == bindAddress.address) + log.info( + "Remoting started with transport [Artery {}]; listening on address [{}] with UID [{}]", + settings.Transport, bindAddress.address, bindAddress.uid) + else { + log.info( + "Remoting started with transport [Artery {}];", settings.Transport) + log.info( + "Remoting is listening on address [{}] with UID [{}] and bind to [{}] with UID [{}]", + localAddress.address, localAddress.uid, bindAddress.address, bindAddress.uid) + } + } protected def startTransport(): Unit From 59aaf0a529aa6542723d328b61766bb4be2fa487 Mon Sep 17 00:00:00 2001 From: Yoel Garcia Diaz Date: Thu, 7 Mar 2019 08:07:38 +0000 Subject: [PATCH 3/8] spelling --- .../src/main/scala/akka/remote/artery/ArteryTransport.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala index 3374b63e62..1c1071979a 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala @@ -467,7 +467,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr log.info( "Remoting started with transport [Artery {}];", settings.Transport) log.info( - "Remoting is listening on address [{}] with UID [{}] and bind to [{}] with UID [{}]", + "Remoting is listening on address [{}] with UID [{}] and binded to [{}] with UID [{}]", localAddress.address, localAddress.uid, bindAddress.address, bindAddress.uid) } From f241e1b8608a42a739133982645470fbadd672b4 Mon Sep 17 00:00:00 2001 From: Yoel Garcia Diaz Date: Thu, 7 Mar 2019 08:29:28 +0000 Subject: [PATCH 4/8] spelling --- .../src/main/scala/akka/remote/artery/ArteryTransport.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala index 1c1071979a..ea95ff02cf 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala @@ -467,7 +467,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr log.info( "Remoting started with transport [Artery {}];", settings.Transport) log.info( - "Remoting is listening on address [{}] with UID [{}] and binded to [{}] with UID [{}]", + "Remoting is listening on address [{}] with UID [{}] and bound to [{}] with UID [{}]", localAddress.address, localAddress.uid, bindAddress.address, bindAddress.uid) } From 639e2a5ae337f5736086ad3ab2d0a5add0cb75f7 Mon Sep 17 00:00:00 2001 From: Yoel Garcia Diaz Date: Thu, 7 Mar 2019 08:34:53 +0000 Subject: [PATCH 5/8] single log statement interpolation made sense here because log.info supports a max of 4 args --- .../src/main/scala/akka/remote/artery/ArteryTransport.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala index ea95ff02cf..fa6efac936 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala @@ -465,9 +465,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr settings.Transport, bindAddress.address, bindAddress.uid) else { log.info( - "Remoting started with transport [Artery {}];", settings.Transport) - log.info( - "Remoting is listening on address [{}] with UID [{}] and bound to [{}] with UID [{}]", + s"Remoting started with transport [Artery ${settings.Transport}]; listening on address [{}] with UID [{}] and bound to [{}] with UID [{}]", localAddress.address, localAddress.uid, bindAddress.address, bindAddress.uid) } From 85ac56d20cdbd6240b74edf942305520a253b664 Mon Sep 17 00:00:00 2001 From: Yoel Garcia Diaz Date: Thu, 7 Mar 2019 10:13:54 +0000 Subject: [PATCH 6/8] formatting --- .../src/main/scala/akka/remote/artery/ArteryTransport.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala index fa6efac936..6be089792d 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala @@ -458,7 +458,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr topLevelFlightRecorder.loFreq(Transport_StartupFinished, NoMetaData) startRemoveQuarantinedAssociationTask() - + if (localAddress.address == bindAddress.address) log.info( "Remoting started with transport [Artery {}]; listening on address [{}] with UID [{}]", @@ -468,7 +468,7 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr s"Remoting started with transport [Artery ${settings.Transport}]; listening on address [{}] with UID [{}] and bound to [{}] with UID [{}]", localAddress.address, localAddress.uid, bindAddress.address, bindAddress.uid) } - + } protected def startTransport(): Unit From 3605aff28308a09a6cc532f57696f8953d9b200c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoel=20Garc=C3=ADa=20D=C3=ADaz?= Date: Thu, 7 Mar 2019 12:33:35 +0000 Subject: [PATCH 7/8] output UID only once for bind and local addresses --- .java-version | 2 +- .../src/main/scala/akka/remote/artery/ArteryTransport.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.java-version b/.java-version index 6259340971..729df553ea 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -1.8 +1.8.0.192 diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala index 6be089792d..ec5342e05e 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala @@ -465,8 +465,8 @@ private[remote] abstract class ArteryTransport(_system: ExtendedActorSystem, _pr settings.Transport, bindAddress.address, bindAddress.uid) else { log.info( - s"Remoting started with transport [Artery ${settings.Transport}]; listening on address [{}] with UID [{}] and bound to [{}] with UID [{}]", - localAddress.address, localAddress.uid, bindAddress.address, bindAddress.uid) + s"Remoting started with transport [Artery ${settings.Transport}]; listening on address [{}] and bound to [{}] with UID [{}]", + localAddress.address, bindAddress.address, localAddress.uid) } } From 365172487c42334056065e8fd97ec2533d47adc5 Mon Sep 17 00:00:00 2001 From: Yoel Garcia Diaz Date: Thu, 7 Mar 2019 12:34:01 +0000 Subject: [PATCH 8/8] Delete .java-version --- .java-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .java-version diff --git a/.java-version b/.java-version deleted file mode 100644 index 729df553ea..0000000000 --- a/.java-version +++ /dev/null @@ -1 +0,0 @@ -1.8.0.192