diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxdbhigh/db.c | 6 | ||||
| -rw-r--r-- | src/zabbix_server/watchdog/watchdog.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index 9d520b0f..516b8569 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -91,8 +91,12 @@ void DBconnect(int flag) ******************************************************************************/ int DBping(void) { - return (ZBX_DB_DOWN == zbx_db_connect(CONFIG_DBHOST, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBNAME, CONFIG_DBSOCKET, CONFIG_DBPORT))? FAIL:SUCCEED; + int ret; + ret = (ZBX_DB_DOWN == zbx_db_connect(CONFIG_DBHOST, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBNAME, CONFIG_DBSOCKET, CONFIG_DBPORT))? FAIL:SUCCEED; + DBclose(); + + return ret; } /****************************************************************************** diff --git a/src/zabbix_server/watchdog/watchdog.c b/src/zabbix_server/watchdog/watchdog.c index bda68969..9fa20693 100644 --- a/src/zabbix_server/watchdog/watchdog.c +++ b/src/zabbix_server/watchdog/watchdog.c @@ -147,7 +147,7 @@ static void ping_database() { zabbix_log(LOG_LEVEL_DEBUG, "In ping_database()"); /* This is test SQL query, it does nothing */ - if(zbx_db_execute("update config set alert_usrgrpid=alert_usrgrpid where 0=1") == ZBX_DB_DOWN) + if(DBping() == FAIL) { zabbix_log(LOG_LEVEL_WARNING, "Watchdog: Database is down"); send_alerts(); |