flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Coloring is reset before the LF.

Browse Source
This commit is contained in:
madmaxoft 2013-08-10 13:03:05 +02:00
parent 9794496571
commit 19781ecad5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Log.cpp
View File

@ -117,13 +117,13 @@ void cLog::Log(const char * a_Format, va_list argList)
AString Line; AString Line;
#ifdef _DEBUG #ifdef _DEBUG
Printf(Line, "[%04x|%02d:%02d:%02d] %s\n", cIsThread::GetCurrentID(), timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str()); Printf(Line, "[%04x|%02d:%02d:%02d] %s", cIsThread::GetCurrentID(), timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
#else #else
Printf(Line, "[%02d:%02d:%02d] %s\n", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str()); Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
#endif #endif
if (m_File) if (m_File)
{ {
fputs(Line.c_str(), m_File); fprintf(m_File, "%s\n", Line.c_str(), m_File);
fflush(m_File); fflush(m_File);
} }

10
source/MCLogger.cpp
View File

@ -18,8 +18,6 @@ bool g_ShouldColorOutput = false;
WORD g_DefaultConsoleAttrib = 0x07; WORD g_DefaultConsoleAttrib = 0x07;
#elif defined (__linux) && !defined(ANDROID_NDK) #elif defined (__linux) && !defined(ANDROID_NDK)
#include <unistd.h> // Needed for isatty() on Linux #include <unistd.h> // Needed for isatty() on Linux
bool g_ShouldColorOutput;
#endif #endif
@ -40,7 +38,7 @@ cMCLogger::cMCLogger(void)
AString FileName; AString FileName;
Printf(FileName, "LOG_%d.txt", (int)time(NULL)); Printf(FileName, "LOG_%d.txt", (int)time(NULL));
m_Log = new cLog(FileName); m_Log = new cLog(FileName);
m_Log->Log("--- Started Log ---"); m_Log->Log("--- Started Log ---\n");
s_MCLogger = this; s_MCLogger = this;
@ -74,7 +72,7 @@ cMCLogger::cMCLogger(const AString & a_FileName)
cMCLogger::~cMCLogger() cMCLogger::~cMCLogger()
{ {
m_Log->Log("--- Stopped Log ---"); m_Log->Log("--- Stopped Log ---\n");
delete m_Log; delete m_Log;
if (this == s_MCLogger) if (this == s_MCLogger)
s_MCLogger = NULL; s_MCLogger = NULL;
@ -116,6 +114,7 @@ void cMCLogger::Log(const char * a_Format, va_list a_ArgList)
SetColor(csRegular); SetColor(csRegular);
m_Log->Log(a_Format, a_ArgList); m_Log->Log(a_Format, a_ArgList);
ResetColor(); ResetColor();
puts("");
} }
@ -128,6 +127,7 @@ void cMCLogger::Info(const char * a_Format, va_list a_ArgList)
SetColor(csInfo); SetColor(csInfo);
m_Log->Log(a_Format, a_ArgList); m_Log->Log(a_Format, a_ArgList);
ResetColor(); ResetColor();
puts("");
} }
@ -140,6 +140,7 @@ void cMCLogger::Warn(const char * a_Format, va_list a_ArgList)
SetColor(csWarning); SetColor(csWarning);
m_Log->Log(a_Format, a_ArgList); m_Log->Log(a_Format, a_ArgList);
ResetColor(); ResetColor();
puts("");
} }
@ -152,6 +153,7 @@ void cMCLogger::Error(const char * a_Format, va_list a_ArgList)
SetColor(csError); SetColor(csError);
m_Log->Log(a_Format, a_ArgList); m_Log->Log(a_Format, a_ArgList);
ResetColor(); ResetColor();
puts("");
} }