You can grab your balls again - #1387
Merged
Merged
Conversation
Contributor
|
Both issues seem fixed. |
GeekOfWires
added a commit
to GeekOfWires/PSF-LoginServer
that referenced
this pull request
Aug 3, 2026
Brings in upstream through 2f63d1c, most notably the server hitch reduction work (psforever#1386), the PropertyOverrideManager revert (psforever#1388) and the LLU/zone-lock fixes (psforever#1387). Conflict resolutions: - pekko.conf: psforever#1386 added `akka.actor.default-dispatcher` and `akka.scheduler` blocks. Git followed the akka.conf -> pekko.conf rename and merged them textually, which would have left both blocks under an `akka.*` prefix that Pekko never reads -- silently discarding the default-dispatcher sizing and the scheduler wheel tuning. Renamed both to `pekko.*` and updated the surrounding prose. - SocketPane / InterstellarClusterService: kept the Pekko namespace and took upstream's added `DispatcherSelector` import. - ContainableBehavior: took upstream's fix that drops the duplicate Resume(). That removed the only use of AskTimeoutException, so the import goes with it. - docker-compose.yml: kept the JDK 21 image this branch moved to, and carried over upstream's rationale for keeping the compose JVM aligned with the Dockerfile's. - SocketActor / SocketPane comments: the spawn-site dispatcher comments from psforever#1386 refer to the config file by name; updated akka.conf -> pekko.conf. Verified: `sbt compile` is green on JDK 21, upstream's drain-limit config, spawn-site dispatchers and V018 index migration all survive the merge, and the tree carries no Akka references outside the pre-existing `AkkaActor` alias in Default.scala. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Neither has linked issues; llu was mentioned in chat and the tower capture thing has a few #bug-reports