diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/server/database/Database/MySQLConnection.cpp | 8 | ||||
-rw-r--r-- | src/server/game/Scripting/ScriptReloadMgr.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index b5600a831ff..3383f9507ed 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -559,7 +559,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 {} @{}:{} ({}).", @@ -579,7 +579,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 { @@ -602,12 +602,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 {}. Unexpected behaviour possible.", errNo); diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index 121cbc2286c..96125ffc113 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -1505,7 +1505,7 @@ void LibraryUpdateListener::handleFileAction(efsw::WatchID watchid, std::string reloader->QueueSharedLibraryChanged(path); break; default: - WPAbort(); + ABORT(); break; } }); @@ -1595,7 +1595,7 @@ void SourceUpdateListener::handleFileAction(efsw::WatchID watchid, std::string c reloader->QueueModifySourceFile(script_module_name_, path); break; default: - WPAbort(); + ABORT(); break; } }); |