1 files changed, 23 insertions, 17 deletions
diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index f24726e..ed8df8c 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -21,21 +21,7 @@
 #include <stdio.h>
 
 
-template<> CLogger* CSingleton<CLogger>::mInstance = 0;
-
-
-CLogger& CLogger::GetInstance()
-{
-    assert(mInstance);
-    return *mInstance;
-}
-
-
-CLogger* CLogger::GetInstancePointer()
-{
-    assert(mInstance);
-    return mInstance;
-}
+template<> CLogger* CSingleton<CLogger>::mInstance = nullptr;
 
 
 CLogger::CLogger()
@@ -57,8 +43,10 @@ void CLogger::Log(LogType type, const char *str, va_list args)
         return;
 
     switch (type) {
-        case LOG_WARN: fprintf(IsOpened() ? mFile : stderr, "[WARN]: "); break;
-        case LOG_INFO: fprintf(IsOpened() ? mFile : stderr, "[INFO]: "); break;
+        case LOG_TRACE: fprintf(IsOpened() ? mFile : stderr, "[TRACE]: "); break;
+        case LOG_DEBUG: fprintf(IsOpened() ? mFile : stderr, "[DEBUG]: "); break;
+        case LOG_WARN:  fprintf(IsOpened() ? mFile : stderr, "[WARN]: "); break;
+        case LOG_INFO:  fprintf(IsOpened() ? mFile : stderr, "[INFO]: "); break;
         case LOG_ERROR: fprintf(IsOpened() ? mFile : stderr, "[ERROR]: "); break;
         default: break;
     }
@@ -67,6 +55,24 @@ void CLogger::Log(LogType type, const char *str, va_list args)
 }
 
 
+void CLogger::Trace(const char *str, ...)
+{
+    va_list args;
+    va_start(args, str);
+    Log(LOG_TRACE, str, args);
+    va_end(args);
+}
+
+
+void CLogger::Debug(const char *str, ...)
+{
+    va_list args;
+    va_start(args, str);
+    Log(LOG_DEBUG, str, args);
+    va_end(args);
+}
+
+
 void CLogger::Info(const char *str, ...)
 {
     va_list args;