From 19e716b522eef6e1500b744f62ebef601ab6efd6 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Sun, 15 Dec 2019 23:58:10 +0100 Subject: [PATCH] Add filename and line no to log entries This is done for all logging calls, also those which call error! which is normally directly shown to the user. --- src/lib.rs | 2 +- src/log.rs | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index f4595bf17..ed934d4f7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,7 +20,7 @@ extern crate strum_macros; extern crate debug_stub_derive; #[macro_use] -mod log; +pub mod log; #[macro_use] pub mod error; diff --git a/src/log.rs b/src/log.rs index 31537eb19..e5f987b03 100644 --- a/src/log.rs +++ b/src/log.rs @@ -7,7 +7,8 @@ macro_rules! info { }; ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{ let formatted = format!($msg, $($args),*); - emit_event!($ctx, $crate::Event::Info(formatted)); + let full = format!("{}:{}: {}", file!(), line!(), &formatted); + emit_event!($ctx, $crate::Event::Info(full)); }}; } @@ -18,7 +19,8 @@ macro_rules! warn { }; ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{ let formatted = format!($msg, $($args),*); - emit_event!($ctx, $crate::Event::Warning(formatted)); + let full = format!("{}:{}: {}", file!(), line!(), &formatted); + emit_event!($ctx, $crate::Event::Warning(full)); }}; } @@ -29,7 +31,8 @@ macro_rules! error { }; ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{ let formatted = format!($msg, $($args),*); - emit_event!($ctx, $crate::Event::Error(formatted)); + let full = format!("{}:{}: {}", file!(), line!(), &formatted); + emit_event!($ctx, $crate::Event::Error(full)); }}; }