2 files changed, 16 insertions, 6 deletions

diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt
index 2a021049f..e237b6429 100644
--- a/Tools/MCADefrag/CMakeLists.txt
+++ b/Tools/MCADefrag/CMakeLists.txt
@@ -39,14 +39,12 @@ set_exe_flags()
 set(SHARED_SRC
 	../../src/StringCompression.cpp
 	../../src/StringUtils.cpp
-	../../src/Log.cpp
-	../../src/MCLogger.cpp
+	../../src/Listeners.cpp
+	../../src/LogDispacher.cpp
 )
 set(SHARED_HDR
 	../../src/ByteBuffer.h
 	../../src/StringUtils.h
-	../../src/Log.h
-	../../src/MCLogger.h
 )
 flatten_files(SHARED_SRC)
 flatten_files(SHARED_HDR)
diff --git a/Tools/MCADefrag/MCADefrag.cpp b/Tools/MCADefrag/MCADefrag.cpp
index a2de7f957..702b04ebf 100644
--- a/Tools/MCADefrag/MCADefrag.cpp
+++ b/Tools/MCADefrag/MCADefrag.cpp
@@ -5,7 +5,8 @@
 
 #include "Globals.h"
 #include "MCADefrag.h"
-#include "MCLogger.h"
+#include "LogDispacher.h"
+#include "Listeners.h"
 #include "zlib/zlib.h"
 
 
@@ -21,7 +22,13 @@ static const Byte g_Zeroes[4096] = {0};
 
 int main(int argc, char ** argv)
 {
-	new cMCLogger(Printf("Defrag_%08x.log", time(NULL)));
+	Logger::cLoggerListener * consoleLogListener = Logger::MakeConsoleListener();
+	Logger::cLoggerListener * fileLogListener = new Logger::cFileListener();
+	Logger::GetInstance().AttachListener(consoleLogListener);
+	Logger::GetInstance().AttachListener(fileLogListener);
+	
+	Logger::InitiateMultithreading();
+	
 	cMCADefrag Defrag;
 	if (!Defrag.Init(argc, argv))
 	{
@@ -30,6 +37,11 @@ int main(int argc, char ** argv)
 	
 	Defrag.Run();
 	
+	Logger::GetInstance().DetachListener(consoleLogListener);
+	delete consoleLogListener;
+	Logger::GetInstance().DetachListener(fileLogListener);
+	delete fileLogListener;
+	
 	return 0;
 }