- processing of DB stopped situations for MySQL (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@1096 97f52cf1-0a1b-0410-bd0e-c28be96e8082

6 files changed, 9 insertions, 9 deletions

diff --git a/src/zabbix_sucker/alerter.c b/src/zabbix_sucker/alerter.c
index 0f12b76d..60c32277 100644
--- a/src/zabbix_sucker/alerter.c
+++ b/src/zabbix_sucker/alerter.c
@@ -139,7 +139,7 @@ int main_alerter_loop()
 #ifdef HAVE_FUNCTION_SETPROCTITLE
 		setproctitle("connecting to the database");
 #endif
-		DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+		DBconnect();
 
 		sprintf(sql,"select a.alertid,a.mediatypeid,a.sendto,a.subject,a.message,a.status,a.retries,mt.mediatypeid,mt.type,mt.description,mt.smtp_server,mt.smtp_helo,mt.smtp_email,mt.exec_path from alerts a,media_type mt where a.status=0 and a.retries<3 and a.mediatypeid=mt.mediatypeid order by a.clock");
 		result = DBselect(sql);
diff --git a/src/zabbix_sucker/housekeeper.c b/src/zabbix_sucker/housekeeper.c
index 1be0f296..94edae48 100644
--- a/src/zabbix_sucker/housekeeper.c
+++ b/src/zabbix_sucker/housekeeper.c
@@ -216,7 +216,7 @@ int main_housekeeper_loop()
 #ifdef HAVE_FUNCTION_SETPROCTITLE
 		setproctitle("connecting to the database");
 #endif
-		DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+		DBconnect();
 
 #ifdef HAVE_FUNCTION_SETPROCTITLE
 		setproctitle("housekeeper [removing deleted hosts]");
diff --git a/src/zabbix_sucker/pinger.c b/src/zabbix_sucker/pinger.c
index 4beb10d0..2e5e922e 100644
--- a/src/zabbix_sucker/pinger.c
+++ b/src/zabbix_sucker/pinger.c
@@ -227,7 +227,7 @@ int main_pinger_loop(void)
 #ifdef HAVE_FUNCTION_SETPROCTITLE
 		setproctitle("connecting to the database");
 #endif
-		DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+		DBconnect();
 
 		ret = create_host_file();
 
diff --git a/src/zabbix_sucker/zabbix_sucker.c b/src/zabbix_sucker/zabbix_sucker.c
index f664401c..d147633c 100644
--- a/src/zabbix_sucker/zabbix_sucker.c
+++ b/src/zabbix_sucker/zabbix_sucker.c
@@ -1026,7 +1026,7 @@ int main_nodata_loop()
 #ifdef HAVE_FUNCTION_SETPROCTITLE
 		setproctitle("updating nodata() functions");
 #endif
-		DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+		DBconnect();
 
 		now=time(NULL);
 #ifdef HAVE_PGSQL
@@ -1063,7 +1063,7 @@ int main_sucker_loop()
 	int	now;
 	int	nextcheck,sleeptime;
 
-	DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+	DBconnect();
 	for(;;)
 	{
 #ifdef HAVE_FUNCTION_SETPROCTITLE
@@ -1146,7 +1146,7 @@ int main(int argc, char **argv)
 	zabbix_log( LOG_LEVEL_WARNING, "Starting zabbix_suckerd...");
 
 /* Need to set trigger status to UNKNOWN since last run */
-	DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+	DBconnect();
 	DBupdate_triggers_status_after_restart();
 
 /*#define CALC_TREND*/
diff --git a/src/zabbix_trapper/zabbix_trapper.c b/src/zabbix_trapper/zabbix_trapper.c
index 5b352404..acfd223c 100644
--- a/src/zabbix_trapper/zabbix_trapper.c
+++ b/src/zabbix_trapper/zabbix_trapper.c
@@ -148,7 +148,7 @@ int	main()
 /*	???
 	value=atof(value_string);*/
 
-	DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+	DBconnect();
 	ret=process_data(0,server,key,value_string);
 
 	alarm(0);
diff --git a/src/zabbix_trapper/zabbix_trapperd.c b/src/zabbix_trapper/zabbix_trapperd.c
index 8c5cb6a3..700314cb 100644
--- a/src/zabbix_trapper/zabbix_trapperd.c
+++ b/src/zabbix_trapper/zabbix_trapperd.c
@@ -357,7 +357,7 @@ void	child_main(int i,int listenfd, int addrlen)
 	if(0 == CONFIG_CONNECTONEACH)
 	{
 		zabbix_log( LOG_LEVEL_DEBUG, "Before DBconnect()");
-		DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+		DBconnect();
 		zabbix_log( LOG_LEVEL_DEBUG, "After DBconnect()");
 	}
 
@@ -376,7 +376,7 @@ void	child_main(int i,int listenfd, int addrlen)
 
 		if(1 == CONFIG_CONNECTONEACH)
 		{
-			DBconnect(CONFIG_DBHOST, CONFIG_DBNAME, CONFIG_DBUSER, CONFIG_DBPASSWORD, CONFIG_DBSOCKET);
+			DBconnect();
 		}
 		process_child(connfd);
 		if(1 == CONFIG_CONNECTONEACH)