From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 28 Dec 2020 18:12:51 +0000 (+0000)
Subject: Make connection to server
X-Git-Tag: otter-0.2.0~112
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=65097411dbf59f7b6ab995108cbd58946f1cf752;p=otter.git

Make connection to server

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/wdriver.rs b/wdriver.rs
index 203f3f42..75dbb049 100644
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -37,6 +37,8 @@ pub use std::process::{Command, Stdio};
 pub use std::thread::sleep;
 pub use std::time;
 
+pub use otter::mgmtchannel::MgmtChannel;
+
 use otter::config::DAEMON_STARTUP_REPORT;
 
 pub type T4d = t4::WebDriver;
@@ -482,13 +484,17 @@ fn prepare_xserver(cln: &cleanup_notify::Handle, ds: &DirSubst) {
 }
 
 #[throws(AE)]
-fn prepare_gameserver(cln: &cleanup_notify::Handle, ds: &DirSubst) {
-  let config = ds.subst(&r##"
+fn prepare_gameserver(cln: &cleanup_notify::Handle, ds: &DirSubst)
+                      -> MgmtChannel {
+  let subst = ds.also(&[
+    ("command_socket", "command.socket"),
+  ]);
+  let config = subst.subst(&r##"
 base_dir = "@build@"
 public_url = "@url@"
 
 save_dir = "."
-command_socket = "command.socket"
+command_socket = "@command_socket@"
 template_dir = "@src@/templates"
 nwtemplate_dir = "@src@/nwtemplates"
 bundled_sources = "@target@/bundled-sources"
@@ -526,6 +532,12 @@ _ = "error" # rocket
     Ok::<_,AE>(())
   })()
     .context(server_exe).context("game server")?;
+
+  let server_conn = MgmtChannel::connect(
+    &subst.subst(&"@command_socket@")?
+  )?;
+
+  server_conn
 }
 
 impl DirSubst {