change logManager to singleton

* If not using the debug logger, the spdlog will not be instanciated. Thus, no need to perform ShutdownLogging()
* refactor VisionUnitResult to std::vector instead of double pointer
main
Yik Teng Hie 11 months ago
parent 1113c5817f
commit 511dfab2b4

@ -97,7 +97,7 @@ private:
bool m_bResultValid; // To indicate Valid result (Eg.: Partial Inspection)
std::string m_strResultCode;
CVisionResult **m_pVisionResult;
std::vector<std::vector<CVisionResult>> m_pVisionResult; // GxLx
// For Intel MARKTRAYMAP / PMI PCS validation
int m_nHostAck;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -19,26 +19,26 @@ extern UTILITYDLL CLegacyGuiEventLog mitechGuiEventLog;
#include "LogManager.h"
using namespace mitech::utils::logging;
extern UTILITYDLL CLogManager logManager;
#endif
//
template <typename... Args>
void TraceLog(fmt::format_string<Args...> _fmt, Args&&... args)
{
logManager.GetLogger(eLOGGER::DEBUG_LOG).Trace(_fmt, args...);
CLoggerManagerSingleton::Instance().LoggerManager().GetLogger(eLOGGER::DEBUG_LOG).Trace(_fmt, args...);
}
template <typename... Args>
void InfoLog(fmt::format_string<Args...> _fmt, Args&&... args)
{
logManager.GetLogger(eLOGGER::DEBUG_LOG).Info(_fmt, args...);
CLoggerManagerSingleton::Instance().LoggerManager().GetLogger(eLOGGER::DEBUG_LOG).Info(_fmt, args...);
}
template <typename... Args>
void DebugLog(fmt::format_string<Args...> _fmt, Args&&... args)
{
logManager.GetLogger(eLOGGER::DEBUG_LOG).Log(_fmt, args...);
CLoggerManagerSingleton::Instance().LoggerManager().GetLogger(eLOGGER::DEBUG_LOG).Log(_fmt, args...);
}
template <typename... Args>
@ -46,7 +46,7 @@ void DebugLogTrace(bool bTraceData, fmt::format_string<Args...> _fmt, Args&&...
{
if (bTraceData)
{
logManager.GetLogger(eLOGGER::DEBUG_LOG).Log(_fmt, args...);
CLoggerManagerSingleton::Instance().LoggerManager().GetLogger(eLOGGER::DEBUG_LOG).Log(_fmt, args...);
}
}
@ -55,14 +55,14 @@ void DebugLogError(bool bTraceData, fmt::format_string<Args...> _fmt, Args&&...
{
if (bTraceData)
{
logManager.GetLogger(eLOGGER::DEBUG_LOG).Error(_fmt, args...);
CLoggerManagerSingleton::Instance().LoggerManager().GetLogger(eLOGGER::DEBUG_LOG).Error(_fmt, args...);
}
}
template <typename... Args>
void DebugLogTiming(fmt::format_string<Args...> _fmt, Args&&... args)
{
logManager.GetLogger(eLOGGER::DEBUG_TIMING_LOG).Log(_fmt, args...);
CLoggerManagerSingleton::Instance().LoggerManager().GetLogger(eLOGGER::DEBUG_TIMING_LOG).Log(_fmt, args...);
}
template <typename... Args>
@ -70,14 +70,14 @@ void DebugLogTimingTrace(bool bTraceData, fmt::format_string<Args...> _fmt, Args
{
if (bTraceData)
{
logManager.GetLogger(eLOGGER::DEBUG_TIMING_LOG).Log(_fmt, args...);
CLoggerManagerSingleton::Instance().LoggerManager().GetLogger(eLOGGER::DEBUG_TIMING_LOG).Log(_fmt, args...);
}
}
template <typename... Args>
void GUIEventLog(fmt::format_string<Args...> _fmt, Args&&... args)
{
logManager.GetLogger(eLOGGER::GUI_EVENT_LOG).Log(_fmt, args...);
CLoggerManagerSingleton::Instance().LoggerManager().GetLogger(eLOGGER::GUI_EVENT_LOG).Log(_fmt, args...);
}
std::shared_ptr<spdlog::logger> UTILITYDLL GetLogger(const std::string& strName);

@ -3,6 +3,8 @@
#include <array>
#include <map>
#include "DllDefines.h"
#include "LogSettings.h"
#include "Logger.h"
@ -40,4 +42,35 @@ namespace mitech::utils::logging
std::map<eLOGGER, stLogOption> m_mapLoggerOption;
std::map<eLOGGER, std::unique_ptr<CLogger>> m_mapLogger;
};
//
class UTILITYDLL CLoggerManagerSingleton
{
public:
/*
* Disable copy constructor and assignment operators
*/
class CLoggerManagerSingleton(const CLoggerManagerSingleton&) = delete;
class CLoggerManagerSingleton& operator=(const CLoggerManagerSingleton&) = delete;
// accessor
static CLoggerManagerSingleton& Instance()
{
static CLoggerManagerSingleton _instance;
return _instance;
}
CLogManager& LoggerManager()
{
return m_loggerManager;
}
private:
// private ctor
CLoggerManagerSingleton() = default;
~CLoggerManagerSingleton() = default;
CLogManager m_loggerManager;
};
}

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save