diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-08-02 09:18:32 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-08-02 09:18:32 +0000 |
| commit | 4ebce71e264df861fda3d3681f3d22011b075392 (patch) | |
| tree | c5389a89488c130c2cd216d3010eee0c59b0b8e7 /src | |
| parent | 8abab0300a093849fe78447d55f78d88932170cf (diff) | |
| download | zabbix-4ebce71e264df861fda3d3681f3d22011b075392.tar.gz zabbix-4ebce71e264df861fda3d3681f3d22011b075392.tar.xz zabbix-4ebce71e264df861fda3d3681f3d22011b075392.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@1916 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_agent/Makefile.am | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/active.c | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am index 033f5203..7ff5a5e5 100644 --- a/src/zabbix_agent/Makefile.am +++ b/src/zabbix_agent/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = . bin_PROGRAMS = zabbix_agent zabbix_agentd zabbix_agentd_SOURCES = active.c cpustat.c diskdevices.c interfaces.c logfiles.c stats.c zabbix_agentd.c zabbix_agentd_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxlog/libzbxlog.a ../libs/zbxcrypto/libzbxcrypto.a \ -../libs/zbxpid/libzbxpid.a ../libs/zbxnet/libzbxnet.a ../libs/zbxconf/libzbxconf.a +../libs/zbxpid/libzbxpid.a ../libs/zbxnet/libzbxnet.a ../libs/zbxconf/libzbxconf.a ../libs/zbxcommon/libzbxcommon.a zabbix_agent_SOURCES = zabbix_agent.c zabbix_agent_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxlog/libzbxlog.a ../libs/zbxcrypto/libzbxcrypto.a \ ../libs/zbxnet/libzbxnet.a ../libs/zbxconf/libzbxconf.a diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index eb3f4f0c..af2ed074 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -323,7 +323,7 @@ int get_active_checks(char *server, int port, char *error, int max_error_len) return SUCCEED; } -int send_value(char *server,int port,char *shortname,char *value) +int send_value(char *server,int port,char *host, char *key,char *value) { int i,s; char tosend[1024]; @@ -372,7 +372,8 @@ int send_value(char *server,int port,char *shortname,char *value) return FAIL; } - snprintf(tosend,sizeof(tosend)-1,"%s:%s\n",shortname,value); + comms_create_request(host, key, value, tosend,sizeof(tosend)-1); +// snprintf(tosend,sizeof(tosend)-1,"%s:%s\n",shortname,value); if( sendto(s,tosend,strlen(tosend),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)) == -1 ) { @@ -398,7 +399,7 @@ int send_value(char *server,int port,char *shortname,char *value) } else { - zabbix_log( LOG_LEVEL_DEBUG, "NOT OK [%s]", shortname); + zabbix_log( LOG_LEVEL_DEBUG, "NOT OK [%s:%s]", host, key); } if( close(s)!=0 ) @@ -438,10 +439,11 @@ int process_active_checks(char *server, int port) count=0; while(process_log(filename,&metrics[i].lastlogsize,value) == 0) { - snprintf(shortname, MAX_STRING_LEN-1,"%s:%s",CONFIG_HOSTNAME,metrics[i].key); - zabbix_log( LOG_LEVEL_DEBUG, "%s",shortname); +// snprintf(shortname, MAX_STRING_LEN-1,"%s:%s",CONFIG_HOSTNAME,metrics[i].key); +// zabbix_log( LOG_LEVEL_DEBUG, "%s",shortname); snprintf(value_tmp, MAX_STRING_LEN-1,"%d:%s",metrics[i].lastlogsize,value); - if(send_value(server,port,shortname,value_tmp) == FAIL) + + if(send_value(server,port,CONFIG_HOSTNAME,metrics[i].key,value_tmp) == FAIL) { ret = FAIL; break; @@ -461,9 +463,9 @@ int process_active_checks(char *server, int port) { process(metrics[i].key, value); - snprintf(shortname, MAX_STRING_LEN-1,"%s:%s",CONFIG_HOSTNAME,metrics[i].key); - zabbix_log( LOG_LEVEL_DEBUG, "%s",shortname); - if(send_value(server,port,shortname,value) == FAIL) +// snprintf(shortname, MAX_STRING_LEN-1,"%s:%s",CONFIG_HOSTNAME,metrics[i].key); +// zabbix_log( LOG_LEVEL_DEBUG, "%s",shortname); + if(send_value(server,port,CONFIG_HOSTNAME,metrics[i].key,value) == FAIL) { ret = FAIL; break; |