From d3a3b1e1f2c87d7f47e57a6cd450153b9778107f Mon Sep 17 00:00:00 2001
From: Rohan Sircar <rohansircar@tuta.io>
Date: Sun, 9 May 2021 00:16:13 +0530
Subject: [PATCH] use full qualified name for log statements

---
 src/errors/domain_error.rs | 6 +++---
 src/lib.rs                 | 4 +---
 src/routes/auth.rs         | 2 +-
 src/routes/users.rs        | 4 ++--
 src/utils/ops.rs           | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/errors/domain_error.rs b/src/errors/domain_error.rs
index 30c25d1..b6491df 100644
--- a/src/errors/domain_error.rs
+++ b/src/errors/domain_error.rs
@@ -44,7 +44,7 @@ impl ResponseError for DomainError {
                 })
             }
             DomainError::DbError { source: _ } => {
-                error!("{}", err);
+                log::error!("{}", err);
                 HttpResponse::InternalServerError().json(ErrorModel {
                     // error_code: 500,
                     success: false,
@@ -52,7 +52,7 @@ impl ResponseError for DomainError {
                 })
             }
             DomainError::DbPoolError { source: _ } => {
-                error!("{}", err);
+                log::error!("{}", err);
                 HttpResponse::InternalServerError().json(ErrorModel {
                     // error_code: 500,
                     success: false,
@@ -74,7 +74,7 @@ impl ResponseError for DomainError {
                 })
             }
             DomainError::ThreadPoolError { message: _ } => {
-                error!("{}", err);
+                log::error!("{}", err);
                 HttpResponse::InternalServerError().json(ErrorModel {
                     // error_code: 400,
                     success: false,
diff --git a/src/lib.rs b/src/lib.rs
index c16fd01..aa13a81 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,8 +3,6 @@
 extern crate diesel;
 #[macro_use]
 extern crate derive_new;
-#[macro_use]
-extern crate log;
 
 mod actions;
 mod errors;
@@ -99,7 +97,7 @@ pub fn app_logger() -> Logger {
 
 pub async fn run(addr: String, app_data: AppData) -> io::Result<()> {
     let bi = get_build_info();
-    info!("Starting {} {}", bi.crate_info.name, bi.crate_info.version);
+    log::info!("Starting {} {}", bi.crate_info.name, bi.crate_info.version);
     println!(
         r#"
                        __  .__                     .___                     
diff --git a/src/routes/auth.rs b/src/routes/auth.rs
index d69fa48..c0f5cc1 100644
--- a/src/routes/auth.rs
+++ b/src/routes/auth.rs
@@ -45,7 +45,7 @@ pub async fn logout(
 ) -> Result<HttpResponse, Error> {
     let maybe_identity = id.identity();
     let response = if let Some(identity) = maybe_identity {
-        info!("Logging out {user}", user = identity);
+        log::info!("Logging out {user}", user = identity);
         id.forget();
         HttpResponse::Found().header("location", "/").finish()
     } else {
diff --git a/src/routes/users.rs b/src/routes/users.rs
index 71357fd..48cecad 100644
--- a/src/routes/users.rs
+++ b/src/routes/users.rs
@@ -61,7 +61,7 @@ pub async fn get_all_users(
     .await
     .map_err(|err| DomainError::new_thread_pool_error(err.to_string()))?;
 
-    debug!("{:?}", users);
+    log::debug!("{:?}", users);
 
     if !users.is_empty() {
         Ok(HttpResponse::Ok().json(users))
@@ -87,7 +87,7 @@ pub async fn add_user(
         })
         .await
         .map(|user| {
-            debug!("{:?}", user);
+            log::debug!("{:?}", user);
             HttpResponse::Created().json(user)
         }),
 
diff --git a/src/utils/ops.rs b/src/utils/ops.rs
index c20022a..519c545 100644
--- a/src/utils/ops.rs
+++ b/src/utils/ops.rs
@@ -6,7 +6,7 @@ pub trait LogErrorResult<T, E> {
 impl<T, E: Display> LogErrorResult<T, E> for Result<T, E> {
     fn log_err(self) -> Result<T, E> {
         self.map_err(|err| {
-            error!("{}", err.to_string());
+            log::error!("{}", err.to_string());
             err
         })
     }