From 245d7ffe37f59e11a76e4cf427ee6ea79119d13d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 5 Sep 2020 22:03:15 +0100
Subject: [PATCH] logging conversion

---
 server.toml    | 3 +++
 src/api.rs     | 6 ++----
 src/imports.rs | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/server.toml b/server.toml
index e1046ba2..8d7d72bd 100644
--- a/server.toml
+++ b/server.toml
@@ -6,3 +6,6 @@ template_dir = "/home/ian/Rustup/Game/server/templates"
 
 [log]
 global_level = 'debug'
+
+[log.modules]
+'hyper::server' = 'info'
diff --git a/src/api.rs b/src/api.rs
index 570da5f0..b0da887a 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -90,8 +90,6 @@ fn api_piece_op<O: ApiPieceOp>(form : Json<ApiPiece<O>>)
       if client == pc.lastclient { pc.gen_before_lastclient }
       else { pc.gen };
 
-    eprintln!("Q_GEN={:?} U_GEN={:?}", u_gen, q_gen);
-
     if u_gen > q_gen { throw!(PieceOpError::Conflict) }
     if pc.held != None && pc.held != Some(player) {
       throw!(OnlineError::PieceHeld)
@@ -112,7 +110,7 @@ fn api_piece_op<O: ApiPieceOp>(form : Json<ApiPiece<O>>)
       )?;
     },
     Err(ReportViaResponse(err)) => {
-      eprintln!("API ERROR => {:?}", &err);
+      warn!("api_piece_op ERROR {:?}: {:?}", &form, &err);
       Err(err)?;
     },
     Ok((update, logents)) => {
@@ -122,7 +120,7 @@ fn api_piece_op<O: ApiPieceOp>(form : Json<ApiPiece<O>>)
       buf.piece_update(piece, update, &lens);
       buf.log_updates(logents);
 
-      eprintln!("API {:?} OK", &form);
+      debug!("api_piece_op OK: {:?}", &form);
     }
   }
   ""
diff --git a/src/imports.rs b/src/imports.rs
index 6ef553e8..d09dd4a6 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -67,6 +67,8 @@ pub use regex::Regex;
 
 pub use arrayvec::ArrayVec;
 
+pub use log::{debug,warn};
+
 pub use flexi_logger::{LogSpecification};
 
 pub use crate::global::*;
-- 
2.30.2