NO TAG IN GLOBAL LOGGING

pwojcikdev · Jan 13, 2024 · 0b7de38 · 0b7de38
1 parent ffe89f4
commit 0b7de38
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/nano/lib/logging.hpp b/nano/lib/logging.hpp
@@ -120,38 +120,38 @@ nano::nlogger & default_logger ();
 namespace nano::log
 {
 template <class... Args>
-void log (nano::log::level level, nano::log::type tag, spdlog::format_string_t<Args...> fmt, Args &&... args)
+void log (nano::log::level level, spdlog::format_string_t<Args...> fmt, Args &&... args)
 {
-	nano::default_logger ().log (level, tag, fmt, std::forward<Args> (args)...);
+	nano::default_logger ().log (level, nano::log::type::all, fmt, std::forward<Args> (args)...);
 }
 
 template <class... Args>
-void debug (nano::log::type tag, spdlog::format_string_t<Args...> fmt, Args &&... args)
+void debug (spdlog::format_string_t<Args...> fmt, Args &&... args)
 {
-	nano::default_logger ().debug (tag, fmt, std::forward<Args> (args)...);
+	nano::default_logger ().debug (nano::log::type::all, fmt, std::forward<Args> (args)...);
 }
 
 template <class... Args>
-void info (nano::log::type tag, spdlog::format_string_t<Args...> fmt, Args &&... args)
+void info (spdlog::format_string_t<Args...> fmt, Args &&... args)
 {
-	nano::default_logger ().info (tag, fmt, std::forward<Args> (args)...);
+	nano::default_logger ().info (nano::log::type::all, fmt, std::forward<Args> (args)...);
 }
 
 template <class... Args>
-void warn (nano::log::type tag, spdlog::format_string_t<Args...> fmt, Args &&... args)
+void warn (spdlog::format_string_t<Args...> fmt, Args &&... args)
 {
-	nano::default_logger ().warn (tag, fmt, std::forward<Args> (args)...);
+	nano::default_logger ().warn (nano::log::type::all, fmt, std::forward<Args> (args)...);
 }
 
 template <class... Args>
-void error (nano::log::type tag, spdlog::format_string_t<Args...> fmt, Args &&... args)
+void error (spdlog::format_string_t<Args...> fmt, Args &&... args)
 {
-	nano::default_logger ().error (tag, fmt, std::forward<Args> (args)...);
+	nano::default_logger ().error (nano::log::type::all, fmt, std::forward<Args> (args)...);
 }
 
 template <class... Args>
-void critical (nano::log::type tag, spdlog::format_string_t<Args...> fmt, Args &&... args)
+void critical (spdlog::format_string_t<Args...> fmt, Args &&... args)
 {
-	nano::default_logger ().critical (tag, fmt, std::forward<Args> (args)...);
+	nano::default_logger ().critical (nano::log::type::all, fmt, std::forward<Args> (args)...);
 }
 }
diff --git a/nano/nano_node/daemon.cpp b/nano/nano_node/daemon.cpp
@@ -63,7 +63,7 @@ constexpr std::size_t OPEN_FILE_DESCRIPTORS_LIMIT = 16384;
 
 void nano::daemon::run (std::filesystem::path const & data_path, nano::node_flags const & flags)
 {
-	nano::log::info (nano::log::type::daemon, "Daemon started");
+	nano::log::info ("Daemon started");
 
 	install_abort_signal_handler ();
 
@@ -77,7 +77,7 @@ void nano::daemon::run (std::filesystem::path const & data_path, nano::node_flag
 		auto error = nano::read_log_config_toml (data_path, log_config, flags.config_overrides);
 		if (error)
 		{
-			nano::log::error (nano::log::type::daemon, "Error reading logging config: {}, using defaults", error.get_message ());
+			nano::log::error ("Error reading logging config: {}, using defaults", error.get_message ());
 			log_config = nano::log_config::daemon_default ();
 		}
 	}
@@ -243,5 +243,5 @@ void nano::daemon::run (std::filesystem::path const & data_path, nano::node_flag
 		nlogger.critical (nano::log::type::daemon, "Error deserializing node config: {}", error.get_message ());
 	}
 
-	nano::log::info (nano::log::type::daemon, "Daemon exiting...");
+	nano::log::info ("Daemon exiting...");
 }
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
@@ -1498,7 +1498,7 @@ nano::node_wrapper::node_wrapper (std::filesystem::path const & path_a, std::fil
 		auto error = nano::read_log_config_toml (config_path_a, log_config, node_flags_a.config_overrides);
 		if (error)
 		{
-			nano::log::error (nano::log::type::daemon, "Error reading logging config: {}, using defaults", error.get_message ());
+			nano::log::error ("Error reading logging config: {}, using defaults", error.get_message ());
 			log_config = nano::log_config::daemon_default ();
 		}
 	}
@@ -1510,11 +1510,11 @@ nano::node_wrapper::node_wrapper (std::filesystem::path const & path_a, std::fil
 	{
 		if (node_flags_a.config_overrides.empty ())
 		{
-			nano::log::error (nano::log::type::node_wrapper, "Error deserializing node config: {}", error.get_message ());
+			nano::log::error ("Error deserializing node config: {}", error.get_message ());
 		}
 		else
 		{
-			nano::log::error (nano::log::type::node_wrapper, "Error deserializing node config or --config option: {}", error.get_message ());
+			nano::log::error ("Error deserializing node config or --config option: {}", error.get_message ());
 		}
 		std::exit (1);
 	}