2 files changed, 7 insertions, 90 deletions

diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 187b9eaa79b..7a34eaa0c0d 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -20,15 +20,12 @@
 
 #include "Common.h"
 #include "Log.h"
-#include "Policies/SingletonImp.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "Util.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 
-INSTANTIATE_SINGLETON_1( Log );
-
 Log::Log() :
     raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
     dberLogfile(NULL), chatLogfile(NULL), m_gmlog_per_account(false), 
@@ -450,7 +447,7 @@ void Log::outCrash(const char * err, ...)
     va_list ap;
 
     va_start(ap, err);
-    vutf8printf(stdout, err, &ap);
+    vutf8printf(stderr, err, &ap);
     va_end(ap);
 
     if (m_colored)
@@ -530,7 +527,6 @@ void Log::outArena(const char * str, ...)
         va_end(ap);
         fflush(arenaLogFile);
     }
-    fflush(stdout);
 }
 
 void Log::outErrorDb(const char * err, ...)
@@ -902,7 +898,6 @@ void Log::outRemote(const char * str, ...)
         va_end(ap);
         fflush(raLogfile);
     }
-    fflush(stdout);
 }
 
 void Log::outChat(const char * str, ...)
@@ -930,76 +925,4 @@ void Log::outChat(const char * str, ...)
         fflush(chatLogfile);
         va_end(ap);
     }
-    fflush(stdout);
-}
-
-void outstring_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outString(buf);
-}
-
-void detail_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outDetail(buf);
-}
-
-void debug_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outDebug(buf);
-}
-
-void error_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outError(buf);
-}
-
-void error_db_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton<Log>::Instance().outErrorDb(buf);
 }
-
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index deb6c55e4e0..fb584d42c27 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -22,7 +22,7 @@
 #define TRINITYCORE_LOG_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include <ace/Singleton.h>
 #include "Database/DatabaseEnv.h"
 
 class Config;
@@ -82,9 +82,9 @@ enum ColorTypes
 
 const int Colors = int(WHITE)+1;
 
-class Log : public Trinity::Singleton<Log, Trinity::ClassLevelLockable<Log, ACE_Thread_Mutex> >
+class Log
 {
-    friend class Trinity::OperatorNew<Log>;
+    friend class ACE_Singleton<Log, ACE_Thread_Mutex>;
     Log();
     ~Log();
 
@@ -172,19 +172,13 @@ class Log : public Trinity::Singleton<Log, Trinity::ClassLevelLockable<Log, ACE_
         std::string m_dumpsDir;
 };
 
-#define sLog Trinity::Singleton<Log>::Instance()
+#define sLog (*ACE_Singleton<Log, ACE_Thread_Mutex>::instance())
 
 #ifdef TRINITY_DEBUG
-#define DEBUG_LOG Trinity::Singleton<Log>::Instance().outDebug
+#define DEBUG_LOG sLog.outDebug
 #else
 #define DEBUG_LOG
 #endif
 
-// primary for script library
-void  outstring_log(const char * str, ...) ATTR_PRINTF(1,2);
-void  detail_log(const char * str, ...) ATTR_PRINTF(1,2);
-void  debug_log(const char * str, ...) ATTR_PRINTF(1,2);
-void  error_log(const char * str, ...) ATTR_PRINTF(1,2);
-void  error_db_log(const char * str, ...) ATTR_PRINTF(1,2);
 #endif