xerbalind/planetwars.dev
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

propagate PlayerAction::Terminated

Browse source
This commit is contained in:
Ilion Beyst 2022-09-25 11:06:50 +02:00
parent f7261e165b
commit b7bcbdd3a6
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
planetwars-matchrunner/src/match_log.rs
View file

@ -15,6 +15,8 @@ pub enum MatchLogMessage {
GameState(State),
#[serde(rename = "stderr")]
StdErr(StdErrMessage),
#[serde(rename = "bot_terminated")]
BotTerminated { player_id: u32 },
#[serde(rename = "timeout")]
Timeout { player_id: u32 },
#[serde(rename = "bad_command")]

6
planetwars-matchrunner/src/pw_match.rs
View file

@ -1,3 +1,4 @@
use crate::match_context::RequestError;
use crate::match_log::MatchLogMessage;
use super::match_context::{MatchCtx, RequestResult};
@ -89,7 +90,8 @@ impl PwMatch {
fn execute_action(&mut self, player_num: usize, turn: RequestResult<Vec<u8>>) -> PlayerAction {
let data = match turn {
Err(_timeout) => return PlayerAction::Timeout,
Err(RequestError::Timeout) => return PlayerAction::Timeout,
Err(RequestError::BotTerminated) => return PlayerAction::Terminated,
Ok(data) => data,
};
@ -123,6 +125,7 @@ impl PwMatch {
PlayerAction::Timeout => self.match_ctx.log(MatchLogMessage::Timeout {
player_id: player_id as u32,
}),
PlayerAction::Terminated => (), // TODO: should something be logged here?
PlayerAction::ParseError { data, error } => {
// TODO: can this be handled better?
let command =
@ -156,6 +159,7 @@ pub struct PlayerCommand {
// TODO: can we name this better? Is this a "play"?
pub enum PlayerAction {
Timeout,
Terminated,
ParseError {
data: Vec<u8>,
error: serde_json::Error,