pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add refinements to linux crash handler

Browse Source
This commit is contained in:
Akkadius 2019-09-23 01:56:03 -05:00
parent 161edef2a8
commit 118c6b5636
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/crash.cpp
View File

@ -116,12 +116,13 @@ void set_exception_handler() {
#include <stdlib.h> #include <stdlib.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <sys/fcntl.h>
void print_trace() void print_trace()
{ {
auto uid = geteuid (); auto uid = geteuid();
std::cout << "running as user id " << uid << std::endl; std::string temp_output_file = "/tmp/dump-output";
char pid_buf[30]; char pid_buf[30];
sprintf(pid_buf, "%d", getpid()); sprintf(pid_buf, "%d", getpid());
@ -129,7 +130,9 @@ void print_trace()
name_buf[readlink("/proc/self/exe", name_buf, 511)] = 0; name_buf[readlink("/proc/self/exe", name_buf, 511)] = 0;
int child_pid = fork(); int child_pid = fork();
if (!child_pid) { if (!child_pid) {
dup2(2, 1); // redirect output to stderr int fd = open(temp_output_file.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
dup2(fd, 1); // redirect output to stderr
fprintf(stdout, "stack trace for %s pid=%s\n", name_buf, pid_buf); fprintf(stdout, "stack trace for %s pid=%s\n", name_buf, pid_buf);
if (uid == 0) { if (uid == 0) {
execlp("gdb", "gdb", "--batch", "-n", "-ex", "thread", "-ex", "bt", name_buf, pid_buf, NULL); execlp("gdb", "gdb", "--batch", "-n", "-ex", "thread", "-ex", "bt", name_buf, pid_buf, NULL);
@ -138,17 +141,30 @@ void print_trace()
execlp("sudo", "gdb", "gdb", "--batch", "-n", "-ex", "thread", "-ex", "bt", name_buf, pid_buf, NULL); execlp("sudo", "gdb", "gdb", "--batch", "-n", "-ex", "thread", "-ex", "bt", name_buf, pid_buf, NULL);
} }
close(fd);
abort(); /* If gdb failed to start */ abort(); /* If gdb failed to start */
} }
else { else {
waitpid(child_pid, NULL, 0); waitpid(child_pid, NULL, 0);
} }
std::ifstream input(temp_output_file);
for (std::string line; getline(input, line);) {
LogCrash("{}", line);
}
std::remove(temp_output_file.c_str());
exit(1); exit(1);
} }
// crash is off or an unhandled platform // crash is off or an unhandled platform
void set_exception_handler() void set_exception_handler()
{ {
signal(SIGABRT, reinterpret_cast<void (*)(int)>(print_trace));
signal(SIGFPE, reinterpret_cast<void (*)(int)>(print_trace));
signal(SIGFPE, reinterpret_cast<void (*)(int)>(print_trace));
signal(SIGSEGV, reinterpret_cast<void (*)(int)>(print_trace)); signal(SIGSEGV, reinterpret_cast<void (*)(int)>(print_trace));
} }
#endif #endif

3
common/profanity_manager.cpp
View File

@ -34,9 +34,6 @@ bool EQEmu::ProfanityManager::LoadProfanityList(DBcore *db) {
return true; return true;
} }
char* gpf = 0;
memcpy(gpf, "Ready to crash", 30);
if (!load_database_entries(db)) if (!load_database_entries(db))
return false; return false;