Skip to content

Commit

Permalink
Upgrade to Akka 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wsargent authored and mkurz committed May 20, 2022
1 parent 226130e commit 8b43ad1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ lazy val root = (project in file("."))
// Production dependencies
"com.typesafe.play" %% "play" % playVersion,
"com.typesafe.akka" %% "akka-remote" % AkkaVersion,
"com.typesafe.akka" %% "akka-slf4j" % AkkaVersion,
// Test dependencies for running a Play server
"com.typesafe.play" %% "play-akka-http-server" % playVersion % Test,
"com.typesafe.play" %% "play-logback" % playVersion % Test,
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ object Dependencies {
val Scala212 = "2.12.15" // sync! see comment above
val Scala213 = "2.13.8" // sync! see comment above

val AkkaVersion = "2.5.32"
val AkkaVersion = "2.6.19"
}
3 changes: 2 additions & 1 deletion src/main/scala/play/engineio/EngineIOSessionActor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ class EngineIOSessionActor[SessionData](
import EngineIOManagerActor._
import EngineIOSessionActor._

private val sessionTick = context.system.scheduler.schedule(config.pingInterval, config.pingInterval, self, Tick)
private val sessionTick =
context.system.scheduler.scheduleAtFixedRate(config.pingInterval, config.pingInterval, self, Tick)

override def postStop() = {
retrieveRequesters.foreach { case (transport, (RetrieveRequester(requester, requestId))) =>
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/play/socketio/SocketIOSessionFlow.scala
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,13 @@ private class SocketIOSessionStage[SessionData](
}
}

override def onPull() = {
override def onPull(): Unit = {
if (isAvailable(engineIOOut)) {
pull(engineIOIn)
}
}

override def onDownstreamFinish() = {
override def onDownstreamFinish(cause: Throwable): Unit = {
// Cancel the ins so we can't get any more events
cancel(engineIOIn)
cancel(socketIOIn)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected void configure() {
bind(Router.class).toProvider(new RouterProvider(routerBuilder));
}
})
.build().getWrappedApplication();
.build().asScala();

System.out.println("Started Java application.");
return application;
Expand Down

0 comments on commit 8b43ad1

Please sign in to comment.