mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Don't clobber game log file when we collect a stack trace.

Browse Source 
When the crash catcher catch a signal it forks to collect data about its
parent. In the process the child reinitialize the log file, which ends
up empty.
This commit is contained in:
fredzio 2021-04-17 09:12:03 +02:00
parent 0b8cae4af8
commit 4058e117ca
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/crashcatcher/crashcatcher.cpp
View File

@ -43,7 +43,7 @@ namespace bfs = boost::filesystem;
#include <sys/user.h> #include <sys/user.h>
#endif #endif
static const char crash_switch[] = "--cc-handle-crash"; #include "crashcatcher.hpp"
static const char fatal_err[] = "\n\n*** Fatal Error ***\n"; static const char fatal_err[] = "\n\n*** Fatal Error ***\n";
static const char pipe_err[] = "!!! Failed to create pipe\n"; static const char pipe_err[] = "!!! Failed to create pipe\n";

2
components/crashcatcher/crashcatcher.hpp
View File

@ -9,6 +9,8 @@
#define USE_CRASH_CATCHER 0 #define USE_CRASH_CATCHER 0
#endif #endif
constexpr char crash_switch[] = "--cc-handle-crash";
#if USE_CRASH_CATCHER #if USE_CRASH_CATCHER
extern void crashCatcherInstall(int argc, char **argv, const std::string &crashLogPath); extern void crashCatcherInstall(int argc, char **argv, const std::string &crashLogPath);
#else #else

7
components/debug/debugging.cpp
View File

@ -179,7 +179,12 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
std::cerr.rdbuf (&sb); std::cerr.rdbuf (&sb);
#else #else
// Redirect cout and cerr to the log file // Redirect cout and cerr to the log file
logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName)); // If we are collecting a stack trace, append to existing log file
std::ios_base::openmode mode = std::ios::out;
if(argc == 2 && strcmp(argv[1], crash_switch) == 0)
mode |= std::ios::app;
logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName), mode);
coutsb.open (Debug::Tee(logfile, oldcout)); coutsb.open (Debug::Tee(logfile, oldcout));
cerrsb.open (Debug::Tee(logfile, oldcerr)); cerrsb.open (Debug::Tee(logfile, oldcerr));