You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by he...@apache.org on 2023/06/10 14:19:51 UTC
[incubator-pekko-connectors] branch scala3 updated: support scala3 on unix-domain connector (#162)
This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch scala3
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
The following commit(s) were added to refs/heads/scala3 by this push:
new 4fba4cbce support scala3 on unix-domain connector (#162)
4fba4cbce is described below
commit 4fba4cbce899af9d023fb84fc0983e41c2ccaa20
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Sat Jun 10 15:19:46 2023 +0100
support scala3 on unix-domain connector (#162)
format
---
project/Dependencies.scala | 1 -
.../connectors/unixdomainsocket/impl/UnixDomainSocketImpl.scala | 7 ++++---
.../connectors/unixdomainsocket/scaladsl/UnixDomainSocket.scala | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index f91d585a1..a7f73b73c 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -488,7 +488,6 @@ object Dependencies {
"org.apache.pekko" %% "pekko-http-testkit" % PekkoHttpVersion % Test))
val UnixDomainSocket = Seq(
- crossScalaVersions -= Scala3,
libraryDependencies ++= Seq(
"com.github.jnr" % "jffi" % "1.3.1", // classifier "complete", // Is the classifier needed anymore?
"com.github.jnr" % "jnr-unixsocket" % "0.38.5" // BSD/ApacheV2/CPL/MIT as per https://github.com/akka/alpakka/issues/620#issuecomment-348727265
diff --git a/unix-domain-socket/src/main/scala/org/apache/pekko/stream/connectors/unixdomainsocket/impl/UnixDomainSocketImpl.scala b/unix-domain-socket/src/main/scala/org/apache/pekko/stream/connectors/unixdomainsocket/impl/UnixDomainSocketImpl.scala
index 948ea9cd0..d75f538d3 100644
--- a/unix-domain-socket/src/main/scala/org/apache/pekko/stream/connectors/unixdomainsocket/impl/UnixDomainSocketImpl.scala
+++ b/unix-domain-socket/src/main/scala/org/apache/pekko/stream/connectors/unixdomainsocket/impl/UnixDomainSocketImpl.scala
@@ -17,7 +17,7 @@ package impl
import org.apache.pekko
import pekko.actor.{ Cancellable, CoordinatedShutdown, ExtendedActorSystem, Extension }
import pekko.annotation.InternalApi
-import pekko.event.{ Logging, LoggingAdapter }
+import pekko.event.{ LogSource, Logging, LoggingAdapter }
import pekko.stream._
import pekko.stream.connectors.unixdomainsocket.scaladsl.UnixDomainSocket.{
IncomingConnection,
@@ -371,9 +371,10 @@ private[unixdomainsocket] abstract class UnixDomainSocketImpl(system: ExtendedAc
private val sel = NativeSelectorProvider.getInstance.openSelector
/** Override to customise reported log source */
- protected def logSource: Class[_] = this.getClass
+ protected def logSource: Class[_] = getClass
- private val ioThread = new Thread(() => nioEventLoop(sel, Logging(system, logSource)), "unix-domain-socket-io")
+ private val ioThread =
+ new Thread(() => nioEventLoop(sel, Logging(system, logSource.getName)), "unix-domain-socket-io")
ioThread.start()
CoordinatedShutdown(system).addTask(CoordinatedShutdown.PhaseServiceStop, "stopUnixDomainSocket") { () =>
diff --git a/unix-domain-socket/src/main/scala/org/apache/pekko/stream/connectors/unixdomainsocket/scaladsl/UnixDomainSocket.scala b/unix-domain-socket/src/main/scala/org/apache/pekko/stream/connectors/unixdomainsocket/scaladsl/UnixDomainSocket.scala
index 0f2ab1109..316e7c0d7 100644
--- a/unix-domain-socket/src/main/scala/org/apache/pekko/stream/connectors/unixdomainsocket/scaladsl/UnixDomainSocket.scala
+++ b/unix-domain-socket/src/main/scala/org/apache/pekko/stream/connectors/unixdomainsocket/scaladsl/UnixDomainSocket.scala
@@ -182,5 +182,5 @@ final class UnixDomainSocket(system: ExtendedActorSystem) extends UnixDomainSock
* for example using the [[pekko.stream.scaladsl.Framing]] stages.
*/
def outgoingConnection(path: Path): Flow[ByteString, ByteString, Future[OutgoingConnection]] =
- super.outgoingConnection(UnixSocketAddress(path))
+ super.outgoingConnection(UnixSocketAddress(path), None, true, Duration.Inf)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org