summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornatrixaeria <janng@gmx.de>2019-05-19 17:38:50 +0200
committernatrixaeria <janng@gmx.de>2019-05-19 17:38:50 +0200
commitb65c999daa5c83b9e76c6dca9df088a40e440642 (patch)
tree14a6117dd4317a29c8d377a36588f62fa7c7e799
parent91a1321f0ae1a02df9c3d1a8f890d84a94953a61 (diff)
Change logger to fern
-rw-r--r--game_server/Cargo.toml3
-rw-r--r--game_server/src/backend_connection.rs2
-rw-r--r--game_server/src/game_logger.rs29
-rw-r--r--game_server/src/main.rs5
4 files changed, 35 insertions, 4 deletions
diff --git a/game_server/Cargo.toml b/game_server/Cargo.toml
index 97c0e77..bc14942 100644
--- a/game_server/Cargo.toml
+++ b/game_server/Cargo.toml
@@ -7,7 +7,8 @@ description = "A general game server for connections to web clients. Currently (
[dependencies]
log = "0.4"
-pretty_env_logger = "0.3"
+fern = "0.5.8"
+colored = "1.8"
reqwest = "0.9"
websocket = "0.22"
hyper = "0.10"
diff --git a/game_server/src/backend_connection.rs b/game_server/src/backend_connection.rs
index 6d3537a..11642f2 100644
--- a/game_server/src/backend_connection.rs
+++ b/game_server/src/backend_connection.rs
@@ -29,7 +29,7 @@ impl BackendConnection {
let location = request_data;
let request = client.get(location);
let response = request.send();
- res_sender.send(response);
+ res_sender.send(response).unwrap();
}
}
diff --git a/game_server/src/game_logger.rs b/game_server/src/game_logger.rs
new file mode 100644
index 0000000..e49ebe8
--- /dev/null
+++ b/game_server/src/game_logger.rs
@@ -0,0 +1,29 @@
+use colored::*;
+
+fn color_level(level: log::Level) -> colored::ColoredString {
+ let text = format!("{: <8}", level);
+ match level {
+ log::Level::Error => text.red().bold(),
+ log::Level::Warn => text.yellow(),
+ log::Level::Info => text.green(),
+ log::Level::Debug => text.cyan(),
+ log::Level::Trace => text.magenta(),
+ }
+}
+
+pub fn init_logger() {
+ fern::Dispatch::new().format(|out, message, record|{
+ out.finish(format_args!(
+ "{} {} > {}",
+ color_level(record.level()),
+ record.target(),
+ message
+ )
+ )
+ })
+ .level(log::LevelFilter::Debug)
+ .level_for("hyper", log::LevelFilter::Off)
+ .level_for("tokio-reactor", log::LevelFilter::Off)
+ .chain(std::io::stdout())
+ .apply().unwrap();
+}
diff --git a/game_server/src/main.rs b/game_server/src/main.rs
index e129283..76e7a39 100644
--- a/game_server/src/main.rs
+++ b/game_server/src/main.rs
@@ -4,13 +4,14 @@ mod lobby;
mod gameserver;
mod backend_connection;
+mod game_logger;
+
#[macro_use] extern crate log;
-use pretty_env_logger;
use backend_connection::BackendConnection;
fn main() {
- pretty_env_logger::init();
+ game_logger::init_logger();
let addr = ("127.0.0.1", 5001);
info!("create game server on {:?}", addr);