From 8e1b46fee0f094efdd8cde59429d51d479697e67 Mon Sep 17 00:00:00 2001
From: Ryan <jh.bae@anypointmedia.com>
Date: Thu, 1 Aug 2024 16:17:27 +0900
Subject: [PATCH] 0.1.5

---
 Cargo.toml      |  3 +--
 RELEASE_NOTE.md |  6 +++++-
 src/log.rs      | 32 ++++++++++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 56eecb5..ab95dd2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "device-common"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 authors = ["Ryan Bae <jh.bae@anypointmedia.com>"]
 
@@ -25,7 +25,6 @@ lapin = "2.5"
 sysinfo = "0.31"
 prometheus = "0.13"
 dashmap = "6.0"
-toml = "0.8"
 serial_test = "3.1"
 async-trait = "0.1"
 
diff --git a/RELEASE_NOTE.md b/RELEASE_NOTE.md
index a7504b4..1d17217 100644
--- a/RELEASE_NOTE.md
+++ b/RELEASE_NOTE.md
@@ -17,4 +17,8 @@ first deploy
 
 0.1.4
 ======
-- fix bug for using toml library
\ No newline at end of file
+- fix bug for using toml library
+
+0.1.5
+======
+- fix bug for log
\ No newline at end of file
diff --git a/src/log.rs b/src/log.rs
index 255dfe9..83f3fdb 100644
--- a/src/log.rs
+++ b/src/log.rs
@@ -1,5 +1,5 @@
 use std::env::current_exe;
-use std::fs;
+use std::{env, fs};
 use std::path::Path;
 use tracing::{error, Level, subscriber};
 use tracing_appender::non_blocking::{WorkerGuard};
@@ -10,7 +10,13 @@ use crate::parameter_store::get_parameter;
 fn get_log_level_parameter_key() -> Option<String> {
     let mut ret: Option<String> = None;
 
-    match env!("CARGO_PKG_NAME") {
+    let exe_path = current_exe().expect("Failed to get current executable");
+    let program_name = exe_path.file_name()
+        .unwrap_or_else(|| std::ffi::OsStr::new("unknown"))
+        .to_string_lossy()
+        .to_string();
+
+    match program_name.as_str() {
         "device-gateway" => { ret = Option::from(GATEWAY_LOG_LEVEL_KEY.to_string()) }
         "device-node" => { ret = Option::from(NODE_LOG_LEVEL_KEY.to_string()) }
         "device-ticket" => { ret = Option::from(TICKET_LOG_LEVEL_KEY.to_string()) }
@@ -78,4 +84,26 @@ fn get_log_dir() -> String {
     current_dir.pop();
     current_dir.push("log");
     current_dir.display().to_string()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serial_test::serial;
+
+    fn setup() {
+
+    }
+
+    fn teardown() {
+
+    }
+
+    #[test]
+    #[serial]
+    fn test_get_log_level_parameter_key() {
+        setup();
+        assert!(get_log_level_parameter_key().is_none());
+        teardown();
+    }
 }
\ No newline at end of file