Core/Misc: Replace std::abort with our ABORT macro
* libmysql is not a well behaved library on windows, it installs its own SIGABRT handler every time a new connection is opened, overriding our own (cherry picked from commit 09dea76fb5ede974d6765d40985b033db3fba6a3)
This commit is contained in:
1 parent
770f9e11db
commit
7264a541a9
2 files changed
+6
-6
No files matched your search
@@ -537,7 +537,7 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo, uint8 attempts /*= 5*/)
|
||||
{
|
||||
TC_LOG_FATAL("sql.sql", "Could not re-prepare statements!");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(10));
|
||||
std::abort();
|
||||
ABORT();
|
||||
}
|
||||
|
||||
TC_LOG_INFO("sql.sql", "Successfully reconnected to %s @%s:%s (%s).",
|
||||
@@ -557,7 +557,7 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo, uint8 attempts /*= 5*/)
|
||||
|
||||
// We could also initiate a shutdown through using std::raise(SIGTERM)
|
||||
std::this_thread::sleep_for(std::chrono::seconds(10));
|
||||
std::abort();
|
||||
ABORT();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -580,12 +580,12 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo, uint8 attempts /*= 5*/)
|
||||
case ER_NO_SUCH_TABLE:
|
||||
TC_LOG_ERROR("sql.sql", "Your database structure is not up to date. Please make sure you've executed all queries in the sql/updates folders.");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(10));
|
||||
std::abort();
|
||||
ABORT();
|
||||
return false;
|
||||
case ER_PARSE_ERROR:
|
||||
TC_LOG_ERROR("sql.sql", "Error while parsing SQL. Core fix required.");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(10));
|
||||
std::abort();
|
||||
ABORT();
|
||||
return false;
|
||||
default:
|
||||
TC_LOG_ERROR("sql.sql", "Unhandled MySQL errno %u. Unexpected behaviour possible.", errNo);
|
||||
|
||||
@@ -1509,7 +1509,7 @@ void LibraryUpdateListener::handleFileAction(efsw::WatchID watchid, std::string
|
||||
reloader->QueueSharedLibraryChanged(path);
|
||||
break;
|
||||
default:
|
||||
WPAbort();
|
||||
ABORT();
|
||||
break;
|
||||
}
|
||||
});
|
||||
@@ -1599,7 +1599,7 @@ void SourceUpdateListener::handleFileAction(efsw::WatchID watchid, std::string c
|
||||
reloader->QueueModifySourceFile(script_module_name_, path);
|
||||
break;
|
||||
default:
|
||||
WPAbort();
|
||||
ABORT();
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user