debugging

diff --git a/server.toml b/server.toml
index eb4c0a4f4b6a9df1010329020ec0a98e1227f529..b7775172abeba7a61b315f711544f25b0d53bf5a 100644 (file)
--- 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 4eeb2707004d5a7378ccff4a2a0bdfc53f7811c6..2139afd6de8f77b6e2d8ae915efa96e34e47aa66 100644 (file)
--- 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 fb2aca42e65a1019b228e9343662e3a170cc7d62..004d5db8b99f23c86c78578eb49fd8b642544fd9 100644 (file)
--- 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 3fcaa06d541c7d6adab4f84cd562d71627e902c7..1eb3cf35f2d3f9bb792815deab6dc2e2b847a8a3 100644 (file)
--- 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)
       }