swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-29 23:15:56 -04:00
Code Issues Projects Releases Wiki Activity

default trap script errors to false as they tend to crash the newer javas at the moment

Browse Source
This commit is contained in:
DarthArgus
2016-02-19 19:16:07 -06:00
parent fe09cb38c1
commit bf626d68e4
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ void ConfigServerGame::install(void)
KEY_BOOL (profileScripts, false);
KEY_BOOL (crashOnScriptError, false);
KEY_BOOL (compileScripts, false);
KEY_BOOL (trapScriptCrashes, true);
KEY_BOOL (trapScriptCrashes, false); //this seems to horrifyingly crash java 7/8 sometimes if not always
KEY_INT (scriptWatcherWarnTime, 5000);
KEY_INT (scriptWatcherInterruptTime, 5000);
KEY_INT (scriptStackErrorLimit, 35);
engine/server/library/serverScript/src/shared/JavaLibrary.cpp
-6
View File
@@ -1331,7 +1331,6 @@ void JavaLibrary::initializeJavaThread()
}
ms_loaded = 1;
#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux)
if (ConfigServerGame::getTrapScriptCrashes())
{
//set up signal handler for fatals in linux
@@ -1340,7 +1339,6 @@ void JavaLibrary::initializeJavaThread()
OurSa.sa_flags = 0;
IGNORE_RETURN(sigaction(SIGSEGV, &OurSa, &JavaSa));
}
#endif
// wait until the main thread tells us to shutdown
ms_shutdownJava->wait();
@@ -1349,15 +1347,11 @@ void JavaLibrary::initializeJavaThread()
IGNORE_RETURN(ms_jvm->DestroyJavaVM());
ms_jvm = nullptr;
#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux)
if (ConfigServerGame::getTrapScriptCrashes())
{
// restore the default signal handler
IGNORE_RETURN(sigaction(SIGSEGV, &OrgSa, NULL));
}
#endif
#if defined(_WIN32)
IGNORE_RETURN(FreeLibrary(static_cast<HMODULE>(libHandle)));