From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 5 Sep 2020 23:49:31 +0000 (+0100)
Subject: much logging
X-Git-Tag: otter-0.2.0~1013
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=41453a7b8a1dfedd501938654acb3a2b4bf5b239;p=otter.git

much logging
---

diff --git a/src/global.rs b/src/global.rs
index 8845b465..6939d7c1 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -623,7 +623,7 @@ impl InstanceGuard<'_> {
       rmp_serde::encode::write_named(w, &s.c.g.gs)
     })?;
     self.c.game_dirty = false;
-    info!("saved (now) {:?}", &self.name);
+    debug!("saved (now) {:?}", &self.name);
   }
 
   #[throws(InternalError)]
@@ -873,7 +873,6 @@ pub fn game_flush_task() {
       match ig.save_game_now() {
         Ok(_) => {
           assert!(!ig.c.game_dirty);
-          info!("saved (flush) {:?}", &ig.name);
         },
         Err(e) => {
           // todo: notify the players
diff --git a/src/sse.rs b/src/sse.rs
index 15c2b4ec..0b923a91 100644
--- a/src/sse.rs
+++ b/src/sse.rs
@@ -71,9 +71,9 @@ impl Read for UpdateReader {
     loop {
       let generated = orig_wanted - buf.len();
       if generated > 0 {
-        eprintln!("SENDING {} to {:?} {:?}: {:?}",
-                  generated, &self.player, &self.client,
-                  str::from_utf8(&orig_buf[0..generated]).unwrap());
+        debug!("sending {} to {:?} {:?}: {:?}",
+               generated, &self.player, &self.client,
+               str::from_utf8(&orig_buf[0..generated]).unwrap());
         self.need_flush = true;
         return Ok(generated)
       }
@@ -141,8 +141,8 @@ pub fn content(iad : InstanceAccessDetails<ClientId>, gen: Generation)
     let _g = &mut g.gs;
     let cl = g.clients.byid(client)?;
     let player = cl.player;
-eprintln!("updates content iad={:?} player={:?} cl={:?} updates={:?}",
-          &iad, &player, &cl, &g.updates);
+    trace!("updates content iad={:?} player={:?} cl={:?} updates={:?}",
+           &iad, &player, &cl, &g.updates);
     let gref = iad.gref.clone();
 
     let log = &g.updates.byid(player)?.read_log();
diff --git a/src/updates.rs b/src/updates.rs
index 559bf702..9f736ed1 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -265,8 +265,6 @@ impl<'r> PrepareUpdatesBuffer<'r> {
           pc.lastclient = self.by_client;
         }
         pc.gen = self.gen;
-        eprintln!("PC GEN_LC={:?} LC={:?}", pc.gen, pc.lastclient);
-      
         let pri_for_all = lens.svg_pri(piece,pc,Default::default());
 
         let update = update.try_map_new_state(
@@ -299,8 +297,8 @@ impl<'r> PrepareUpdatesBuffer<'r> {
 
     let update = self.piece_update_fallible(piece, update, lens)
       .unwrap_or_else(|e| {
-        eprintln!("piece update error! piece={:?} lens={:?} error={:?}",
-                  piece, &lens, &e);
+        error!("piece update error! piece={:?} lens={:?} error={:?}",
+               piece, &lens, &e);
         PreparedUpdateEntry::Error(None,
                                    ErrorSignaledViaUpdate::InternalError)
       });
@@ -329,7 +327,7 @@ impl<'r> Drop for PrepareUpdatesBuffer<'r> {
       us: mem::take(&mut self.us),
     };
     let update = Arc::new(update);
-    eprintln!("UPDATE {:?}", &update);
+    trace!("PrepareUpdatesBuffer update {:?}", &update);
 
     for (_tplayer, tplupdates) in &mut self.g.updates {
       tplupdates.push(update.clone());
@@ -346,7 +344,7 @@ impl PreparedUpdate {
     type TUE<'u> = TransmitUpdateEntry<'u>;
     let mut ents = vec![];
     for u in &self.us {
-eprintln!("FOR_TRANSMIT TO={:?} {:?}", dest, &u);
+      trace!("for_transmit to={:?} {:?}", dest, &u);
       let ue = match u {
         &PUE::Piece { piece, client, sameclient_cseq : cseq, ref op }
         if client == dest => {