diff options
| author | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-06-17 13:16:45 +0300 |
|---|---|---|
| committer | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-06-17 13:16:45 +0300 |
| commit | 063b0a8aee41cb3eda5c91cef0c6f9f995173304 (patch) | |
| tree | 6b5b3a0b9d1ceaa8784d21cccd1dd7a3fa929030 | |
| parent | d3c8176f2be1fd78c752767fc9cc1ccb3bbe7591 (diff) | |
.......P.. [ZBX-20638] fixed proxy start
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index 9a5de5e37aa..b76acfcfda7 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -1044,7 +1044,7 @@ static void zbx_check_db(void) if (db_version_info.current_version < db_version_info.min_version) { - zabbix_log(LOG_LEVEL_ERR, "Error! Current %s database server version is too old (%s)", + zabbix_log(LOG_LEVEL_ERR, "Error! Current %s database version is too old (%s)", db_version_info.database, db_version_info.friendly_current_version); zabbix_log(LOG_LEVEL_ERR, "Must be a least %s", db_version_info.friendly_min_version); @@ -1056,7 +1056,7 @@ static void zbx_check_db(void) if (0 == CONFIG_ALLOW_UNSUPPORTED_DB_VERSIONS) { zabbix_log(LOG_LEVEL_ERR, " "); - zabbix_log(LOG_LEVEL_ERR, "Unable to start Zabbix proxy due to unsupported %s database server" + zabbix_log(LOG_LEVEL_ERR, "Unable to start Zabbix proxy due to unsupported %s database" " version (%s).", db_version_info.database, db_version_info.friendly_current_version); @@ -1064,30 +1064,30 @@ static void zbx_check_db(void) { zabbix_log(LOG_LEVEL_ERR, "Must not be higher than (%s).", db_version_info.friendly_max_version); - db_version_info.flag = DB_VERSION_HIGHER_THAN_MAXIMUM_ERROR; } else { zabbix_log(LOG_LEVEL_ERR, "Must be at least (%s).", db_version_info.friendly_min_supported_version); } + zabbix_log(LOG_LEVEL_ERR, "Use of supported database version is highly recommended."); zabbix_log(LOG_LEVEL_ERR, "Override by setting AllowUnsupportedDBVersions=1" " in Zabbix proxy configuration file at your own risk."); zabbix_log(LOG_LEVEL_ERR, " "); + exit(EXIT_FAILURE); } else { zabbix_log(LOG_LEVEL_ERR, " "); - zabbix_log(LOG_LEVEL_ERR, "Warning! Unsupported %s database server version (%s).", + zabbix_log(LOG_LEVEL_ERR, "Warning! Unsupported %s database version (%s).", db_version_info.database, db_version_info.friendly_current_version); if (DB_VERSION_HIGHER_THAN_MAXIMUM == db_version_info.flag) { zabbix_log(LOG_LEVEL_ERR, "Should not be higher than (%s).", db_version_info.friendly_max_version); - db_version_info.flag = DB_VERSION_HIGHER_THAN_MAXIMUM_WARNING; } else { |