From c1ae2dcd08e352fc364f3c38df8a41802752b383 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Sep 2020 14:13:51 +0100
Subject: [PATCH] debugging

---
 server.toml        | 1 +
 src/debugreader.rs | 9 +++++++--
 src/imports.rs     | 1 +
 src/sse.rs         | 7 ++++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/server.toml b/server.toml
index eb4c0a4f..b7775172 100644
--- a/server.toml
+++ b/server.toml
@@ -11,3 +11,4 @@ global_level = 'debug'
 'hyper::server' = 'info'
 rocket = 'error'
 _ = "error" # rocket
+"game::debugreader" = 'info'
diff --git a/src/debugreader.rs b/src/debugreader.rs
index 4eeb2707..2139afd6 100644
--- a/src/debugreader.rs
+++ b/src/debugreader.rs
@@ -9,8 +9,13 @@ impl<T : Read> Read for DebugReader<T> {
     let l = buf.len();
     trace!("{} read({})...", &self.1, l);
     let r = self.0.read(buf);
-    debug!("{} read({}) = {:?} {:?}", &self.1, l, &r,
-           r.as_ref().map(|&r| str::from_utf8(&buf[0..r])));
+    let level = match &r {
+      Err(e) if e.kind() == io::ErrorKind::WouldBlock => log::Level::Trace,
+      Err(_) => log::Level::Info,
+      _ => log::Level::Debug,
+    };
+    log!(level,"{} read({}) = {:?} {:?}", &self.1, l, &r,
+         r.as_ref().map(|&r| str::from_utf8(&buf[0..r])));
     r
   }
 }
diff --git a/src/imports.rs b/src/imports.rs
index fb2aca42..004d5db8 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -68,6 +68,7 @@ pub use regex::Regex;
 pub use arrayvec::ArrayVec;
 
 pub use log::{trace,debug,info,warn,error};
+pub use log::log;
 
 pub use flexi_logger::{LogSpecification};
 
diff --git a/src/sse.rs b/src/sse.rs
index 3fcaa06d..1eb3cf35 100644
--- a/src/sse.rs
+++ b/src/sse.rs
@@ -65,6 +65,10 @@ impl Read for UpdateReader {
                    id: {}\n\n",
              &self.to_send)?;
       self.to_send.try_increment().unwrap();
+
+      debug!("sending to {:?} {:?}: {:?}",
+             &self.player, &self.client, &tu);
+
     }
 
     let cv = pu.get_cv();
@@ -72,9 +76,6 @@ impl Read for UpdateReader {
     loop {
       let generated = orig_wanted - buf.len();
       if generated > 0 {
-        debug!("sending {} to {:?} {:?}: {:?}",
-               generated, &self.player, &self.client,
-               str::from_utf8(&orig_buf[0..generated]).unwrap());
         self.need_flush = true;
         return Ok(generated)
       }
-- 
2.30.2