From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jul 2020 01:55:37 +0000 (+0100)
Subject: OE
X-Git-Tag: otter-0.2.0~1481
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d2e188f5ae06b590b508ed70e40260a6eb9641cc;p=otter.git

OE
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 262900e4..17019052 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -62,12 +62,12 @@ struct SessionForm {
   ptoken : String,
 }
 #[post("/_/session", format="json", data="<form>")]
-fn session(form : Json<SessionForm>) -> Result<Template,RE> {
+fn session(form : Json<SessionForm>) -> Result<Template,OE> {
   // make session in this game, log a message to other players
   let iad = lookup_token(&form.ptoken)?;
   let player = iad.ident;
   let c = {
-    let mut ig = iad.g.lock().map_err(|e| anyhow!("lock poison {:?}",&e))?;
+    let mut ig = iad.g.lock()?;
     let _pl = ig.gs.players.byid_mut(player)?;
     let cl = Client { player };
     let client = ig.clients.insert(cl);