From 731ee15d4d19b1a3dc6c522a79c567a04e9cb3b1 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 6 Aug 2014 10:47:00 +0200 Subject: [PATCH] Exit application when IDO version doesn't match expected version fixes #6850 --- components/db_ido_mysql/idomysqlconnection.cpp | 6 +++--- components/db_ido_pgsql/idopgsqlconnection.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp index 088ce25bf..661609f57 100644 --- a/components/db_ido_mysql/idomysqlconnection.cpp +++ b/components/db_ido_mysql/idomysqlconnection.cpp @@ -214,7 +214,8 @@ void IdoMysqlConnection::Reconnect(void) if (!version_row) { 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); @@ -225,8 +226,7 @@ void IdoMysqlConnection::Reconnect(void) Log(LogCritical, "IdoMysqlConnection", "Schema version '" + version + "' does not match the required version '" + SCHEMA_VERSION + "'! Please check the upgrade documentation."); - BOOST_THROW_EXCEPTION(std::runtime_error("Schema version '" + version + "' does not match the required version '" + - SCHEMA_VERSION + "'!")); + Application::Exit(EXIT_FAILURE); } String instanceName = GetInstanceName(); diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp index 530e837e9..ec85d89c4 100644 --- a/components/db_ido_pgsql/idopgsqlconnection.cpp +++ b/components/db_ido_pgsql/idopgsqlconnection.cpp @@ -216,7 +216,8 @@ void IdoPgsqlConnection::Reconnect(void) if (!version_row) { 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"); @@ -225,8 +226,7 @@ void IdoPgsqlConnection::Reconnect(void) Log(LogCritical, "IdoPgsqlConnection", "Schema version '" + version + "' does not match the required version '" + SCHEMA_VERSION + "'! Please check the upgrade documentation."); - BOOST_THROW_EXCEPTION(std::runtime_error("Schema version '" + version + "' does not match the required version '" + - SCHEMA_VERSION + "'!")); + Application::Exit(EXIT_FAILURE); } String instanceName = GetInstanceName(); -- 2.40.0