From b8c1b47e32215cfa9f0483144ee643867ffc67c7 Mon Sep 17 00:00:00 2001
From: claiff <claiff@mail.ru>
Date: Fri, 23 Sep 2022 16:16:56 +0300
Subject: add phosphor logger

---
 src/logger/journal.cpp       |  2 +-
 src/logger/journal.hpp       |  2 +-
 src/logger/logger_set.cpp    |  4 ++--
 src/logger/logger_set.hpp    |  2 +-
 src/logger/phosphor.cpp      | 12 +++++-------
 src/logger/phosphor.hpp      |  2 +-
 src/logger/types/ilogger.hpp |  5 +++--
 7 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'src/logger')

diff --git a/src/logger/journal.cpp b/src/logger/journal.cpp
index 001e87d..ba002b0 100644
--- a/src/logger/journal.cpp
+++ b/src/logger/journal.cpp
@@ -4,7 +4,7 @@
 
 namespace smtp::logger
 {
-	void Journal::LogError( std::string const& message ) const
+	void Journal::LogError( std::string const& method, std::string const& message ) const
 	{
 		std::cout << message << std::endl;
 	}
diff --git a/src/logger/journal.hpp b/src/logger/journal.hpp
index 1b06b8c..0f1e6bb 100644
--- a/src/logger/journal.hpp
+++ b/src/logger/journal.hpp
@@ -11,7 +11,7 @@ namespace smtp::logger
 		Journal() = default;
 		~Journal() override = default;
 
-		void LogError( std::string const& message ) const override;
+		void LogError( std::string const& method, std::string const& message ) const override;
 	};
 }
 
diff --git a/src/logger/logger_set.cpp b/src/logger/logger_set.cpp
index 6ea6d58..d5d45a0 100644
--- a/src/logger/logger_set.cpp
+++ b/src/logger/logger_set.cpp
@@ -33,11 +33,11 @@ namespace smtp::logger
 		mInstance.reset( new LoggerSet( loggers ));
 	}
 
-	void LoggerSet::LogError( std::string const& message )
+	void LoggerSet::LogError( std::string const& method, std::string const& message )
 	{
 		for( const auto& logger: mLogger )
 		{
-			logger->LogError( message );
+			logger->LogError( method, message );
 		}
 	}
 
diff --git a/src/logger/logger_set.hpp b/src/logger/logger_set.hpp
index fb74e56..e482042 100644
--- a/src/logger/logger_set.hpp
+++ b/src/logger/logger_set.hpp
@@ -19,7 +19,7 @@ namespace smtp::logger
 		LoggerSet( const LoggerSet& ) = delete;
 		LoggerSet& operator=( LoggerSet& ) = delete;
 
-		void LogError( std::string const& message );
+		void LogError( std::string const& method, std::string const& message );
 		static std::shared_ptr < LoggerSet > GetInstance();
 	};
 }
diff --git a/src/logger/phosphor.cpp b/src/logger/phosphor.cpp
index d3c81b0..f3575c4 100644
--- a/src/logger/phosphor.cpp
+++ b/src/logger/phosphor.cpp
@@ -1,15 +1,13 @@
-#include <phosphor-logging/elog-errors.hpp>
-#include <phosphor-logging/elog.hpp>
-#include <xyz/openbmc_project/Common/error.hpp>
+#include <phosphor-logging/lg2.hpp>
 
 #include "phosphor.hpp"
 
 namespace smtp::logger
 {
-	void Phosphor::LogError( std::string const& message ) const
+	void Phosphor::LogError( std::string const& method, std::string const& message ) const
 	{
-		using InternalFailure =
-				sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
-		phosphor::logging::commit<InternalFailure>(message);
+		auto join_message = method + ',' + message;
+		const auto* msg = "OpenBMC.0.1.SMTPError";
+		lg2::error("SMTP error", "REDFISH_MESSAGE_ID", msg, "REDFISH_MESSAGE_ARGS", join_message);
 	}
 }
\ No newline at end of file
diff --git a/src/logger/phosphor.hpp b/src/logger/phosphor.hpp
index dd536b5..f40ddf2 100644
--- a/src/logger/phosphor.hpp
+++ b/src/logger/phosphor.hpp
@@ -11,6 +11,6 @@ namespace smtp::logger
 		Phosphor() = default;
 		~Phosphor() override = default;
 
-		void LogError( std::string const& message ) const override;
+		void LogError( std::string const& method, std::string const& message ) const override;
 	};
 }
diff --git a/src/logger/types/ilogger.hpp b/src/logger/types/ilogger.hpp
index 9f88668..5dce1d5 100644
--- a/src/logger/types/ilogger.hpp
+++ b/src/logger/types/ilogger.hpp
@@ -9,7 +9,8 @@ namespace smtp::logger::types
 	public:
 		virtual ~ILogger() = default;
 
-		virtual void LogError( std::string const& message ) const = 0;
+		virtual void LogError( std::string const& method, std::string const& message ) const = 0;
 	};
-	using ILoggerPtr = std::shared_ptr<ILogger>;
+
+	using ILoggerPtr = std::shared_ptr < ILogger >;
 }
\ No newline at end of file
-- 
cgit v1.2.3