From: Michael Friedrich Date: Tue, 9 May 2017 14:17:58 +0000 (+0200) Subject: Merge pull request #5042 from mbrgm/upgrade-docs-link X-Git-Tag: v2.7.0~90 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=452f8a1f0d19cbac71f8bfe0d728c9e7ae54986c;p=icinga2 Merge pull request #5042 from mbrgm/upgrade-docs-link Add link to upgrade documentation to DB IDO log message --- 452f8a1f0d19cbac71f8bfe0d728c9e7ae54986c diff --cc lib/db_ido_mysql/idomysqlconnection.cpp index 59bfef4ec,690dfd672..92d7f61a9 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@@ -303,9 -303,10 +303,10 @@@ void IdoMysqlConnection::Reconnect(void Log(LogCritical, "IdoMysqlConnection") << "Schema version '" << version << "' does not match the required version '" - << IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation."; + << IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation at " + << "https://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/upgrading-icinga-2#upgrading-mysql-db"; - Application::Exit(EXIT_FAILURE); + BOOST_THROW_EXCEPTION(std::runtime_error("Schema version mismatch.")); } String instanceName = GetInstanceName(); diff --cc lib/db_ido_pgsql/idopgsqlconnection.cpp index 0d0cf3bd6,84210b1f1..28eca8cb3 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@@ -264,9 -264,10 +264,10 @@@ void IdoPgsqlConnection::Reconnect(void Log(LogCritical, "IdoPgsqlConnection") << "Schema version '" << version << "' does not match the required version '" - << IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation."; + << IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation at " + << "https://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/upgrading-icinga-2#upgrading-postgresql-db"; - Application::Exit(EXIT_FAILURE); + BOOST_THROW_EXCEPTION(std::runtime_error("Schema version mismatch.")); } String instanceName = GetInstanceName();