Move logging into an independent crate

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
 members = [
+  "logging-lib",
   "vit-servicing-station-cli",
   "vit-servicing-station-lib",
   "vit-servicing-station-server",

logging-lib/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "logging-lib"
+version = "0.1.0"
+authors = ["danielsanchezq <daniel.sanchez@iohk.io>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+chrono =  { version = "0.4.13", features = ["serde"] }
+log = "0.4.11"
+serde = "1.0.114"
+serde_json = "1.0.57"
+simplelog = "0.8.0"

logging-lib/src/lib.rs

@@ -0,0 +1,3 @@
+pub mod config;
+pub mod messages;
+mod methods;

logging-lib/src/methods.rs

@@ -0,0 +1,43 @@
+#[macro_export]
+macro_rules! log {
+    ($lvl:expr, $($arg:tt)+) => (
+        let formatted_message = format_args!($($arg)+).to_string();
+        let level = $lvl;
+        $crate::messages::LogMessageBuilder::default().with_level(level).with_message(formatted_message).build().log();
+    )
+}
+
+#[macro_export]
+macro_rules! error {
+    ($($arg:tt)+) => (
+        $crate::log!(log::Level::Error, $($arg)+)
+    )
+}
+
+#[macro_export]
+macro_rules! warn {
+    ($($arg:tt)+) => (
+        $crate::log!(log::Level::Warn, $($arg)+)
+    )
+}
+
+#[macro_export]
+macro_rules! info {
+    ($($arg:tt)+) => (
+        $crate::log!(log::Level::Info, $($arg)+)
+    )
+}
+
+#[macro_export]
+macro_rules! debug {
+    ($($arg:tt)+) => (
+        $crate::log!(log::Level::Debug, $($arg)+)
+    )
+}
+
+#[macro_export]
+macro_rules! trace {
+    ($($arg:tt)+) => (
+        $crate::log!($log::Level::Trace, $($arg)+)
+    )
+}

vit-servicing-station-lib/src/lib.rs

@@ -7,7 +7,6 @@ extern crate structopt;
 extern crate diesel_migrations;
 
 pub mod db;
-pub mod logging;
 pub mod server;
 pub mod utils;
 pub mod v0;

vit-servicing-station-server/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.11"
+logging-lib = { path = "../logging-lib" }
 structopt = "0.3.14"
 tokio = { version = "0.2.21", features = ["macros"] }
 vit-servicing-station-lib = { path = "../vit-servicing-station-lib" }

vit-servicing-station-server/src/main.rs

@@ -1,9 +1,12 @@
 use structopt::StructOpt;
+
 use vit_servicing_station_lib::{
-    db, logging::config::config_log, server, server::exit_codes::ApplicationExitCode,
-    server::settings as server_settings, server::settings::ServiceSettings, v0,
+    db, server, server::exit_codes::ApplicationExitCode, server::settings as server_settings,
+    server::settings::ServiceSettings, v0,
 };
 
+use logging_lib::{config::config_log, *};
+
 #[tokio::main]
 async fn main() {
     // load settings from command line (defaults to env variables)
@@ -13,7 +16,7 @@ async fn main() {
     if let Some(settings_file) = &settings.in_settings_file {
         let in_file_settings = server_settings::load_settings_from_file(settings_file)
             .unwrap_or_else(|e| {
-                log::error!("Error loading settings from file {}, {}", settings_file, e);
+                error!("Error loading settings from file {}, {}", settings_file, e);
                 std::process::exit(ApplicationExitCode::LoadSettingsError.into())
             });
         // merge input file settings override by cli arguments
@@ -56,10 +59,9 @@ async fn main() {
 
     let app = v0::filter(context).await;
 
-    log::info!(
+    info!(
         "Running server at {}, database located at {}",
-        settings.address,
-        settings.db_url
+        settings.address, settings.db_url
     );
 
     // run server with settings