summaryrefslogtreecommitdiffstats
path: root/src/libs/zbxdbhigh/db.c
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-13 11:23:03 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-13 11:23:03 +0000
commit5e99b58327c99bab4613ea64769f7873d7415fb3 (patch)
tree8992312dc3923508f4d8dee1a4b01fd3ca457fa8 /src/libs/zbxdbhigh/db.c
parentcb748fe795fbd9886188d0aa26fcb98b917867a3 (diff)
downloadzabbix-5e99b58327c99bab4613ea64769f7873d7415fb3.tar.gz
zabbix-5e99b58327c99bab4613ea64769f7873d7415fb3.tar.xz
zabbix-5e99b58327c99bab4613ea64769f7873d7415fb3.zip
- support of parameters NodeNoEvents and NodeNoHistory (Alexei)
[svn merge -r4552:4553 svn://svn.zabbix.com/branches/1.4.2] git-svn-id: svn://svn.zabbix.com/trunk@4554 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxdbhigh/db.c')
-rw-r--r--src/libs/zbxdbhigh/db.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c
index 12f3b964..b95f2936 100644
--- a/src/libs/zbxdbhigh/db.c
+++ b/src/libs/zbxdbhigh/db.c
@@ -953,7 +953,7 @@ int DBadd_history(zbx_uint64_t itemid, double value, int clock)
DBadd_trend(itemid, value, clock);
- if(CONFIG_MASTER_NODEID>0)
+ if((CONFIG_NODE_NOHISTORY == 0) && (CONFIG_MASTER_NODEID>0))
{
DBexecute("insert into history_sync (nodeid,clock,itemid,value) values (%d,%d," ZBX_FS_UI64 "," ZBX_FS_DBL ")",
get_nodeid_by_id(itemid),
@@ -983,7 +983,7 @@ int DBadd_history_uint(zbx_uint64_t itemid, zbx_uint64_t value, int clock)
DBadd_trend(itemid, (double)value, clock);
- if(CONFIG_MASTER_NODEID>0)
+ if((CONFIG_NODE_NOHISTORY == 0) && (CONFIG_MASTER_NODEID>0))
{
DBexecute("insert into history_uint_sync (nodeid,clock,itemid,value) values (%d,%d," ZBX_FS_UI64 "," ZBX_FS_UI64 ")",
get_nodeid_by_id(itemid),
@@ -1014,7 +1014,7 @@ int DBadd_history_str(zbx_uint64_t itemid, char *value, int clock)
value_esc);
}
- if(CONFIG_MASTER_NODEID>0)
+ if((CONFIG_NODE_NOHISTORY == 0) && (CONFIG_MASTER_NODEID>0))
{
DBexecute("insert into history_str_sync (nodeid,clock,itemid,value) values (%d,%d," ZBX_FS_UI64 ",'%s')",
get_nodeid_by_id(itemid),