Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- added some additional safety around the logger in case we have problems opening files on the filesystem

Browse Source
This commit is contained in:
Mark Vejvoda 2010-10-15 16:22:35 +00:00
parent 427f505c4c
commit 1353f61069
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/shared_lib/sources/util/util.cpp
View File

@ -342,15 +342,17 @@ void SystemFlags::handleDebug(DebugType type, const char *fmt, ...) {
} }
if(SystemFlags::haveSpecialOutputCommandLineOption == false) { if(SystemFlags::haveSpecialOutputCommandLineOption == false) {
printf("Opening logfile [%s] type = %d, currentDebugLog.fileStreamOwner = %d\n",debugLog.c_str(),type, currentDebugLog.fileStreamOwner); printf("Opening logfile [%s] type = %d, currentDebugLog.fileStreamOwner = %d, file stream open = %d\n",debugLog.c_str(),type, currentDebugLog.fileStreamOwner,currentDebugLog.fileStream->is_open());
} }
MutexSafeWrapper safeMutex(currentDebugLog.mutex); if(currentDebugLog.fileStream->is_open() == true) {
MutexSafeWrapper safeMutex(currentDebugLog.mutex);
(*currentDebugLog.fileStream) << "Starting Mega-Glest logging for type: " << type << "\n"; (*currentDebugLog.fileStream) << "Starting Mega-Glest logging for type: " << type << "\n";
(*currentDebugLog.fileStream).flush(); (*currentDebugLog.fileStream).flush();
safeMutex.ReleaseLock(); safeMutex.ReleaseLock();
}
} }
//printf("Logfile is open [%s]\n",SystemFlags::debugLogFile); //printf("Logfile is open [%s]\n",SystemFlags::debugLogFile);
@ -359,23 +361,29 @@ void SystemFlags::handleDebug(DebugType type, const char *fmt, ...) {
assert(currentDebugLog.fileStream != NULL); assert(currentDebugLog.fileStream != NULL);
MutexSafeWrapper safeMutex(currentDebugLog.mutex); if(currentDebugLog.fileStream->is_open() == true) {
MutexSafeWrapper safeMutex(currentDebugLog.mutex);
if (type != debugPathFinder && type != debugError) { if (type != debugPathFinder && type != debugError) {
(*currentDebugLog.fileStream) << "[" << szBuf2 << "] " << szBuf; (*currentDebugLog.fileStream) << "[" << szBuf2 << "] " << szBuf;
} }
else if (type == debugError) { else if (type == debugError) {
(*currentDebugLog.fileStream) << "[" << szBuf2 << "] *ERROR* " << szBuf; (*currentDebugLog.fileStream) << "[" << szBuf2 << "] *ERROR* " << szBuf;
} }
else { else {
(*currentDebugLog.fileStream) << szBuf; (*currentDebugLog.fileStream) << szBuf;
} }
(*currentDebugLog.fileStream).flush(); (*currentDebugLog.fileStream).flush();
safeMutex.ReleaseLock(); safeMutex.ReleaseLock();
}
} }
// output to console // output to console
else { if( currentDebugLog.debugLogFileName == "" ||
(currentDebugLog.debugLogFileName != "" &&
(currentDebugLog.fileStream == NULL ||
currentDebugLog.fileStream->is_open() == false))) {
if (type != debugPathFinder && type != debugError) { if (type != debugPathFinder && type != debugError) {
printf("[%s] %s", szBuf2, szBuf); printf("[%s] %s", szBuf2, szBuf);
} }