NowChess/NowChessSystems
4
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

fix(official-bots): resume tournaments already joined after restart

Browse Source 
A 409 on join means the bot is already a participant (in-memory join set is
empty after a pod restart). Treat 409 as success and start playing instead of
dropping the tournament and spamming errors every scan.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Janis
2026-06-23 13:46:57 +02:00
parent 06f2adfeb6
commit 285b73efbd
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/official-bots/src/main/scala/de/nowchess/bot/service/TournamentBotGamePlayer.scala
+10 -7
View File
@@ -85,7 +85,7 @@ class TournamentBotGamePlayer:
openTournaments().foreach { tournamentId => openTournaments().foreach { tournamentId =>
if joinedTournaments.add(tournamentId) then if joinedTournaments.add(tournamentId) then
val cfg = TournamentBotConfig(autoJoinServerUrl, tournamentId, token, botId, hardestDifficulty) val cfg = TournamentBotConfig(autoJoinServerUrl, tournamentId, token, botId, hardestDifficulty)
if join(cfg) then startAsync(cfg) if joinedOrParticipating(cfg) then startAsync(cfg)
else joinedTournaments.remove(tournamentId) else joinedTournaments.remove(tournamentId)
} }
} }
@@ -236,7 +236,7 @@ class TournamentBotGamePlayer:
case None => Left("Invalid bot token — could not extract subject") case None => Left("Invalid bot token — could not extract subject")
case Some(botId) => case Some(botId) =>
val cfg = TournamentBotConfig(tournamentServiceUrl, tournamentId, token, botId, difficulty) val cfg = TournamentBotConfig(tournamentServiceUrl, tournamentId, token, botId, difficulty)
if join(cfg) then if joinedOrParticipating(cfg) then
startAsync(cfg) startAsync(cfg)
Right(botId) Right(botId)
else Left("Failed to join tournament") else Left("Failed to join tournament")
@@ -259,15 +259,18 @@ class TournamentBotGamePlayer:
case Failure(ex) => log.warnf(ex, "Tournament event stream dropped — reconnecting"); sleep(5000) case Failure(ex) => log.warnf(ex, "Tournament event stream dropped — reconnecting"); sleep(5000)
case Success(_) => sleep(2000) case Success(_) => sleep(2000)
private def join(cfg: TournamentBotConfig): Boolean = // 200 = joined, 409 = already a participant (e.g. after a restart) — both mean "play this tournament".
private def joinedOrParticipating(cfg: TournamentBotConfig): Boolean =
Try { Try {
val response = authed(cfg, target(cfg).path("join")) val response = authed(cfg, target(cfg).path("join"))
.post(Entity.entity("", MediaType.APPLICATION_JSON)) .post(Entity.entity("", MediaType.APPLICATION_JSON))
val ok = response.getStatus == 200 val status = response.getStatus
if ok then log.infof("Joined tournament %s", cfg.tournamentId)
else log.errorf("Failed to join tournament %s — status %d", cfg.tournamentId, response.getStatus)
response.close() response.close()
ok status match
case 200 => log.infof("Joined tournament %s", cfg.tournamentId); true
case 409 => log.infof("Already in tournament %s — resuming", cfg.tournamentId); true
case other =>
log.errorf("Failed to join tournament %s — status %d", cfg.tournamentId, other); false
}.getOrElse { log.error("Join request failed"); false } }.getOrElse { log.error("Join request failed"); false }
private def streamEvents(cfg: TournamentBotConfig): Unit = private def streamEvents(cfg: TournamentBotConfig): Unit =