- number of forked zabbix_agentd decreased to 5 (Alexei)

 - support for parameter UserParameter in zabbix_agentd.conf (Alexei)


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

3 files changed, 14 insertions, 6 deletions

diff --git a/src/zabbix_agent/sysinfo.c b/src/zabbix_agent/sysinfo.c
index 572b8c36..e4086491 100644
--- a/src/zabbix_agent/sysinfo.c
+++ b/src/zabbix_agent/sysinfo.c
@@ -160,8 +160,6 @@ void	add_user_parameter(char *key,char *command)
 {
 	int i;
 
-	printf("[%s]\n",key);
-
 	for(i=0;;i++)
 	{
 		if( commands[i].key == 0)
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index 747da773..6d9780bb 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -97,6 +97,7 @@ void	process_config_file(void)
 	char	line[1024];
 	char	parameter[1024];
 	char	*value;
+	char	*value2;
 	int	lineno;
 
 	file=fopen("/etc/zabbix/zabbix_agentd.conf","r");
@@ -157,8 +158,17 @@ void	process_config_file(void)
 		}
 		else if(strcmp(parameter,"UserParameter")==0)
 		{
-			add_user_parameter("system[test]","who|wc -l");
-			syslog( LOG_CRIT, "ZZZ");
+			value2=strstr(value,",");
+			if(NULL == value2)
+			{
+				syslog( LOG_CRIT, "Error in line [%s] Line %d Symbol ',' expected", line, lineno);
+				fclose(file);
+				exit(1);
+			}
+			value2[0]=0;
+			value2++;
+			syslog( LOG_WARNING, "Added user-defined parameter [%s] Command [%s]", value, value2);
+//			add_user_parameter("system[test]","who|wc -l");
 		}
 		else
 		{
diff --git a/src/zabbix_sucker/zabbix_sucker.c b/src/zabbix_sucker/zabbix_sucker.c
index cb7a4ba0..1b131925 100644
--- a/src/zabbix_sucker/zabbix_sucker.c
+++ b/src/zabbix_sucker/zabbix_sucker.c
@@ -256,7 +256,7 @@ int	get_value_zabbix(double *result,DB_ITEM *item)
 	{
 		syslog(LOG_WARNING, "Problem with sendto" );
 		close(s);
-		return	NETWORK_ERROR;
+		return	FAIL;
 	} 
 	i=sizeof(struct sockaddr_in);
 
@@ -265,7 +265,7 @@ int	get_value_zabbix(double *result,DB_ITEM *item)
 	{
 		syslog( LOG_WARNING, "Problem with recvfrom [%d]",errno );
 		close(s);
-		return	NETWORK_ERROR;
+		return	FAIL;
 	}
  
 	if( close(s)!=0 )