tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exit application when IDO version doesn't match expected version 

fixes #6850
This commit is contained in:
Gunnar Beutner 2014-08-06 10:47:00 +02:00
parent 8256638fde
commit 731ee15d4d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/db_ido_mysql/idomysqlconnection.cpp
View File

@ -214,7 +214,8 @@ void IdoMysqlConnection::Reconnect(void)
if (!version_row) { if (!version_row) {
Log(LogCritical, "IdoMysqlConnection", "Schema does not provide any valid version! Verify your schema installation."); Log(LogCritical, "IdoMysqlConnection", "Schema does not provide any valid version! Verify your schema installation.");
BOOST_THROW_EXCEPTION(std::runtime_error("Schema does not provide any valid version! Verify your schema installation."));
Application::Exit(EXIT_FAILURE);
} }
DiscardRows(result); DiscardRows(result);
@ -225,8 +226,7 @@ void IdoMysqlConnection::Reconnect(void)
Log(LogCritical, "IdoMysqlConnection", "Schema version '" + version + "' does not match the required version '" + Log(LogCritical, "IdoMysqlConnection", "Schema version '" + version + "' does not match the required version '" +
SCHEMA_VERSION + "'! Please check the upgrade documentation."); SCHEMA_VERSION + "'! Please check the upgrade documentation.");
BOOST_THROW_EXCEPTION(std::runtime_error("Schema version '" + version + "' does not match the required version '" + Application::Exit(EXIT_FAILURE);
SCHEMA_VERSION + "'!"));
} }
String instanceName = GetInstanceName(); String instanceName = GetInstanceName();

6
components/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -216,7 +216,8 @@ void IdoPgsqlConnection::Reconnect(void)
if (!version_row) { if (!version_row) {
Log(LogCritical, "IdoPgsqlConnection", "Schema does not provide any valid version! Verify your schema installation."); Log(LogCritical, "IdoPgsqlConnection", "Schema does not provide any valid version! Verify your schema installation.");
BOOST_THROW_EXCEPTION(std::runtime_error("Schema does not provide any valid version! Verify your schema installation."));
Application::Exit(EXIT_FAILURE);
} }
String version = version_row->Get("version"); String version = version_row->Get("version");
@ -225,8 +226,7 @@ void IdoPgsqlConnection::Reconnect(void)
Log(LogCritical, "IdoPgsqlConnection", "Schema version '" + version + "' does not match the required version '" + Log(LogCritical, "IdoPgsqlConnection", "Schema version '" + version + "' does not match the required version '" +
SCHEMA_VERSION + "'! Please check the upgrade documentation."); SCHEMA_VERSION + "'! Please check the upgrade documentation.");
BOOST_THROW_EXCEPTION(std::runtime_error("Schema version '" + version + "' does not match the required version '" + Application::Exit(EXIT_FAILURE);
SCHEMA_VERSION + "'!"));
} }
String instanceName = GetInstanceName(); String instanceName = GetInstanceName();