summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2003-08-25 17:49:06 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2003-08-25 17:49:06 +0000
commitfdca6420704e04e120da52ff028661caf3a400ff (patch)
treeea4d32e542f805db34de2ed4f359ca6d1821dc08 /src
parent5aed2ad0aac24a4ab41fb1ddb6aaf8369292d875 (diff)
downloadzabbix-fdca6420704e04e120da52ff028661caf3a400ff.tar.gz
zabbix-fdca6420704e04e120da52ff028661caf3a400ff.tar.xz
zabbix-fdca6420704e04e120da52ff028661caf3a400ff.zip
Support of housekeeping for deleted items.
git-svn-id: svn://svn.zabbix.com/trunk@948 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
-rw-r--r--src/zabbix_sucker/housekeeper.c27
1 files changed, 25 insertions, 2 deletions
diff --git a/src/zabbix_sucker/housekeeper.c b/src/zabbix_sucker/housekeeper.c
index 5a98fda4..fe3afe9b 100644
--- a/src/zabbix_sucker/housekeeper.c
+++ b/src/zabbix_sucker/housekeeper.c
@@ -50,8 +50,26 @@
#include "housekeeper.h"
+/* Remove items having status 'deleted' */
+int housekeeping_items(void)
+{
+ char sql[MAX_STRING_LEN+1];
+ DB_RESULT *result;
+ int i,itemid;
+
+ sprintf(sql,"select itemid from items where status=%d", ITEM_STATUS_DELETED);
+ result = DBselect(sql);
+ for(i=0;i<DBnum_rows(result);i++)
+ {
+ itemid=atoi(DBget_field(result,i,0));
+ DBdelete_item(itemid);
+ }
+ DBfree_result(result);
+ return SUCCEED;
+}
+
/* Remove hosts having status 'deleted' */
-int housekeeping_hosts(int now)
+int housekeeping_hosts(void)
{
char sql[MAX_STRING_LEN+1];
DB_RESULT *result;
@@ -203,7 +221,12 @@ int main_housekeeper_loop()
#ifdef HAVE_FUNCTION_SETPROCTITLE
setproctitle("housekeeper [removing deleted hosts]");
#endif
- housekeeping_hosts(now);
+ housekeeping_hosts();
+
+#ifdef HAVE_FUNCTION_SETPROCTITLE
+ setproctitle("housekeeper [removing deleted items]");
+#endif
+ housekeeping_items();
#ifdef HAVE_FUNCTION_SETPROCTITLE
setproctitle("housekeeper [removing old values]");