From 11ba3d7beff3bd8ece5244c595375de8b25ed7c9 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 16 Jan 2024 13:53:57 +0100 Subject: [PATCH] fix managerName to use `pekko` (#587) * fix managerName to use `pekko` * make name configurable * Update PekkoProtocolTransport.scala --- remote/src/main/resources/reference.conf | 2 ++ .../pekko/remote/transport/PekkoProtocolTransport.scala | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/remote/src/main/resources/reference.conf b/remote/src/main/resources/reference.conf index af5558139a..c670028e6e 100644 --- a/remote/src/main/resources/reference.conf +++ b/remote/src/main/resources/reference.conf @@ -267,6 +267,8 @@ pekko { ### Configuration for classic remoting. Classic remoting is deprecated, use artery. + # Used as part of the Actor name for the Protocol Manager. + manager-name-prefix = "pekkoprotocolmanager" # If set to a nonempty string remoting will use the given dispatcher for # its internal actors otherwise the default dispatcher is used. Please note diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala index 5a8a47e2ba..c590258c8e 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala @@ -69,6 +69,8 @@ private[remote] class PekkoProtocolSettings(config: Config) { .getMillisDuration("pekko.remote.classic.handshake-timeout") .requiring(_ > Duration.Zero, "handshake-timeout must be > 0") } + + val ManagerNamePrefix: String = config.getString("pekko.remote.classic.manager-name-prefix") } @nowarn("msg=deprecated") @@ -136,7 +138,8 @@ private[remote] class PekkoProtocolTransport( } override val maximumOverhead: Int = PekkoProtocolTransport.PekkoOverhead - protected def managerName = s"akkaprotocolmanager.${wrappedTransport.schemeIdentifier}${UniqueId.getAndIncrement}" + protected def managerName = + s"${settings.ManagerNamePrefix}.${wrappedTransport.schemeIdentifier}${UniqueId.getAndIncrement}" protected def managerProps = { val wt = wrappedTransport val s = settings