diff options
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 12 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 15 |
2 files changed, 10 insertions, 17 deletions
diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index 68dc6276332..cd3aead421c 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -671,6 +671,10 @@ static void zbx_validate_config(ZBX_TASK_EX *task) err |= (FAIL == check_cfg_feature_int("StartIPMIPollers", CONFIG_IPMIPOLLER_FORKS, "IPMI support")); #endif +#if !defined(HAVE_UNIXODBC) + err |= (FAIL == check_cfg_feature_int("StartODBCPollers", CONFIG_ODBCPOLLER_FORKS, "ODBC support")); +#endif + err |= (FAIL == zbx_db_validate_config_features()); if (0 != err) @@ -1306,14 +1310,6 @@ int MAIN_ZABBIX_ENTRY(int flags) } } -#ifndef HAVE_UNIXODBC - if (0 < CONFIG_ODBCPOLLER_FORKS) - { - zabbix_log(LOG_LEVEL_ERR, "ODBC support is not compiled in, but ODBC polling is enabled."); - return FAIL; - } -#endif - #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) zbx_tls_init_parent(); #endif diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 195be73e3ef..a927ffecd3e 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -138,7 +138,7 @@ const char *help_message[] = { " self-monitoring, snmp trapper, task manager,", " timer, trapper, unreachable poller,", " vmware collector, history poller,", - " availability manager, service manager)", + " availability manager, service manager, odbc poller)", " process-type,N Process type and number (e.g., poller,3)", " pid Process identifier, up to 65535. For larger", " values specify target as \"process-type,N\"", @@ -728,6 +728,11 @@ static void zbx_validate_config(ZBX_TASK_EX *task) #if !defined(HAVE_OPENIPMI) err |= (FAIL == check_cfg_feature_int("StartIPMIPollers", CONFIG_IPMIPOLLER_FORKS, "IPMI support")); #endif + +#if !defined(HAVE_UNIXODBC) + err |= (FAIL == check_cfg_feature_int("StartODBCPollers", CONFIG_ODBCPOLLER_FORKS, "ODBC support")); +#endif + err |= (FAIL == zbx_db_validate_config_features()); if (0 != CONFIG_REPORTWRITER_FORKS && NULL == CONFIG_WEBSERVICE_URL) @@ -1253,14 +1258,6 @@ static int server_startup(zbx_socket_t *listen_sock, zbx_rtc_t *rtc) } } -#ifndef HAVE_UNIXODBC - if (0 < CONFIG_ODBCPOLLER_FORKS) - { - zabbix_log(LOG_LEVEL_ERR, "ODBC support is not compiled in, but ODBC polling is enabled."); - return FAIL; - } -#endif - threads_num = CONFIG_CONFSYNCER_FORKS + CONFIG_POLLER_FORKS + CONFIG_UNREACHABLE_POLLER_FORKS + CONFIG_TRAPPER_FORKS + CONFIG_PINGER_FORKS + CONFIG_ALERTER_FORKS + CONFIG_HOUSEKEEPER_FORKS + CONFIG_TIMER_FORKS |