aboutsummaryrefslogtreecommitdiff
path: root/planetwars-server
diff options
context:
space:
mode:
authorIlion Beyst <ilion.beyst@gmail.com>2022-07-21 21:42:47 +0200
committerIlion Beyst <ilion.beyst@gmail.com>2022-07-21 21:42:47 +0200
commit1011015b29c00480b1a7bcb5e2d98abdb363fc75 (patch)
treef3aababb022dca87a12124ae46c5d1f75eeab14c /planetwars-server
parentb84e9be9d64bad2b1a44f34c499de7dd0525f2b6 (diff)
downloadplanetwars.dev-1011015b29c00480b1a7bcb5e2d98abdb363fc75.tar.xz
planetwars.dev-1011015b29c00480b1a7bcb5e2d98abdb363fc75.zip
show match url in planetwars_client
Diffstat (limited to 'planetwars-server')
-rw-r--r--planetwars-server/configuration.toml3
-rw-r--r--planetwars-server/src/lib.rs3
-rw-r--r--planetwars-server/src/modules/bot_api.rs5
3 files changed, 11 insertions, 0 deletions
diff --git a/planetwars-server/configuration.toml b/planetwars-server/configuration.toml
index 13012f9..87347d9 100644
--- a/planetwars-server/configuration.toml
+++ b/planetwars-server/configuration.toml
@@ -1,5 +1,8 @@
database_url = "postgresql://planetwars:planetwars@localhost/planetwars"
+# front-end is served here in development, which proxies to the backend
+root_url = "http://localhost:3000"
+
python_runner_image = "python:3.10-slim-buster"
container_registry_url = "localhost:9001"
diff --git a/planetwars-server/src/lib.rs b/planetwars-server/src/lib.rs
index c8585f8..050048c 100644
--- a/planetwars-server/src/lib.rs
+++ b/planetwars-server/src/lib.rs
@@ -45,6 +45,9 @@ pub struct GlobalConfig {
/// this will be used when running bots
pub container_registry_url: String,
+ /// webserver root url, used to construct links
+ pub root_url: String,
+
/// directory where bot code will be stored
pub bots_directory: String,
/// directory where match logs will be stored
diff --git a/planetwars-server/src/modules/bot_api.rs b/planetwars-server/src/modules/bot_api.rs
index cb12275..3bc002c 100644
--- a/planetwars-server/src/modules/bot_api.rs
+++ b/planetwars-server/src/modules/bot_api.rs
@@ -135,6 +135,11 @@ impl pb::bot_api_service_server::BotApiService for BotApiServer {
Ok(Response::new(pb::CreatedMatch {
match_id: created_match.base.id,
player_key,
+ // TODO: can we avoid hardcoding this?
+ match_url: format!(
+ "{}/matches/{}",
+ self.runner_config.root_url, created_match.base.id
+ ),
}))
}
}