]> granicus.if.org Git - icinga2/commitdiff
Merge pull request #5042 from mbrgm/upgrade-docs-link
authorMichael Friedrich <michael.friedrich@icinga.com>
Tue, 9 May 2017 14:17:58 +0000 (16:17 +0200)
committerGitHub <noreply@github.com>
Tue, 9 May 2017 14:17:58 +0000 (16:17 +0200)
Add link to upgrade documentation to DB IDO log message

1  2 
lib/db_ido_mysql/idomysqlconnection.cpp
lib/db_ido_pgsql/idopgsqlconnection.cpp

index 59bfef4ec284665b85503b112250753efb7da178,690dfd6722397209e1418bd3e36d27e8640c1420..92d7f61a98a9203eceb82007ce577c3333ed06e8
@@@ -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();
index 0d0cf3bd6a9672be9e158c9fff615cbcaca1a213,84210b1f123d3dfe116c814a8bfb18220bae9a24..28eca8cb323d2172f8eeb2ff0f100bdcd7b0e96b
@@@ -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();