Core/Debugging: Added wheaty everywhere and modified it to always reliably report issues during static initialization

3 files changed, 4 insertions, 2 deletions

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 0a8d9ff2c19..d600de2f35f 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -18,8 +18,6 @@ endif()
 
 if(WIN32)
   set(sources_windows
-    ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.cpp
-    ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h
     ${CMAKE_SOURCE_DIR}/src/common/Platform/ServiceWin32.cpp
     ${CMAKE_SOURCE_DIR}/src/common/Platform/ServiceWin32.h
   )
diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp
index 56eff7c0c07..a17872303d2 100644
--- a/src/server/bnetserver/Main.cpp
+++ b/src/server/bnetserver/Main.cpp
@@ -32,6 +32,7 @@
 #include "SslContext.h"
 #include "DatabaseLoader.h"
 #include "LoginRESTService.h"
+#include "WheatyExceptionReport.h"
 #include <iostream>
 #include <boost/program_options.hpp>
 #include <boost/filesystem/path.hpp>
@@ -77,6 +78,7 @@ static uint32 _banExpiryCheckInterval;
 
 int main(int argc, char** argv)
 {
+    InitializeCrashHandler();
     signal(SIGABRT, &Trinity::AbortHandler);
 
     auto configFile = fs::absolute(_TRINITY_BNET_CONFIG);
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 68c48853bad..293afc4757c 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -47,6 +47,7 @@
 #include "DatabaseLoader.h"
 #include "AppenderDB.h"
 #include "Metric.h"
+#include "WheatyExceptionReport.h"
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
 #include <boost/asio/io_service.hpp>
@@ -99,6 +100,7 @@ variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile, s
 /// Launch the Trinity server
 extern int main(int argc, char** argv)
 {
+    InitializeCrashHandler();
     signal(SIGABRT, &Trinity::AbortHandler);
 
     auto configFile = fs::absolute(_TRINITY_CORE_CONFIG);