diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-14 12:45:30 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-14 12:45:30 +0000 |
| commit | 3ee8a188032fbd4f0d112ba7a7af55e1cfb0e50c (patch) | |
| tree | b28466980423802ead746a4368eb1fa7fe137a62 /src | |
| parent | 7f9f45e1ceb04e9ed16abb39eae83e885f1448b1 (diff) | |
- [ZBX-263] fixed problem with saving of lastlogsize for log[] and eventlog[] items when history is set to 0
[svn merge svn://svn.zabbix.com/branches/1.4 -r5239:5243]
git-svn-id: svn://svn.zabbix.com/trunk@5244 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_agent/active.c | 18 | ||||
| -rw-r--r-- | src/zabbix_server/functions.c | 22 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index c2a29cca..25c3ac36 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -413,7 +413,7 @@ static void process_active_checks(char *server, unsigned short port) break; if ('\0' == *pattern || NULL != zbx_regexp_match(value, pattern, NULL)) { - if (SUCCEED == (send_err = send_value( + send_err = send_value( server, port, CONFIG_HOSTNAME, @@ -422,11 +422,8 @@ static void process_active_checks(char *server, unsigned short port) &lastlogsize, NULL, NULL, - NULL))) - { - active_metrics[i].lastlogsize = lastlogsize; - } - + NULL + ); s_count++; } p_count++; @@ -492,7 +489,7 @@ static void process_active_checks(char *server, unsigned short port) break; if (!pattern || NULL != zbx_regexp_match(value, pattern, NULL)) { - if (SUCCEED == (send_err = send_value( + send_err = send_value( server, port, CONFIG_HOSTNAME, @@ -501,11 +498,8 @@ static void process_active_checks(char *server, unsigned short port) &lastlogsize, ×tamp, source, - &severity))) - { - active_metrics[i].lastlogsize = lastlogsize; - } - + &severity + ); s_count++; } p_count++; diff --git a/src/zabbix_server/functions.c b/src/zabbix_server/functions.c index db94440c..53d3a2f4 100644 --- a/src/zabbix_server/functions.c +++ b/src/zabbix_server/functions.c @@ -525,9 +525,6 @@ static int add_history(DB_ITEM *item, AGENT_RESULT *value, int now) { if(GET_STR_RESULT(value)) DBadd_history_log(0, item->itemid,value->str,now,item->timestamp,item->eventlog_source,item->eventlog_severity); - DBexecute("update items set lastlogsize=%d where itemid=" ZBX_FS_UI64, - item->lastlogsize, - item->itemid); } else if(item->value_type==ITEM_VALUE_TYPE_TEXT) { @@ -577,11 +574,20 @@ static void update_item(DB_ITEM *item, AGENT_RESULT *value, time_t now) DBescape_string(value->str, value_esc, sizeof(value_esc)); } - DBexecute("update items set nextcheck=%d,prevvalue=lastvalue,lastvalue='%s',lastclock=%d where itemid=" ZBX_FS_UI64, - calculate_item_nextcheck(item->itemid, item->type, item->delay, item->delay_flex, now), - value_esc, - (int)now, - item->itemid); + if (item->value_type == ITEM_VALUE_TYPE_LOG) { + DBexecute("update items set nextcheck=%d,prevvalue=lastvalue,lastvalue='%s',lastclock=%d,lastlogsize=%d where itemid=" ZBX_FS_UI64, + calculate_item_nextcheck(item->itemid, item->type, item->delay, item->delay_flex, now), + value_esc, + (int)now, + item->lastlogsize, + item->itemid); + } else { + DBexecute("update items set nextcheck=%d,prevvalue=lastvalue,lastvalue='%s',lastclock=%d where itemid=" ZBX_FS_UI64, + calculate_item_nextcheck(item->itemid, item->type, item->delay, item->delay_flex, now), + value_esc, + (int)now, + item->itemid); + } } /* Logic for delta as speed of change */ else if(item->delta == ITEM_STORE_SPEED_PER_SECOND) |