This is an automated email from the ASF dual-hosted git repository. fanningpj pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
commit 54f3c4b68023ee682cd44fd5b84724d424b9abc6 Author: PJ Fanning <pjfann...@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 dabba7361..1b4f326d9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -450,7 +450,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")) 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 d5c7020b0..c2737e94c 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 7927d922b..5357bdaf5 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-unsubscr...@pekko.apache.org For additional commands, e-mail: commits-h...@pekko.apache.org