diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-25 16:37:09 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-25 16:37:09 +0000 |
| commit | dc4bea51ea068277a384cc406d46e7a35c83d56d (patch) | |
| tree | e9830917ea596fd59aa8f67a62dd761430760400 /src | |
| parent | a29daedc280630dea05654ec2e3e9c531804c0a2 (diff) | |
| download | zabbix-dc4bea51ea068277a384cc406d46e7a35c83d56d.tar.gz zabbix-dc4bea51ea068277a384cc406d46e7a35c83d56d.tar.xz zabbix-dc4bea51ea068277a384cc406d46e7a35c83d56d.zip | |
- actions are not deleted on trigger deletion (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5530 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxdbhigh/host.c | 1 | ||||
| -rw-r--r-- | src/zabbix_server/events.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c index d80468f9..dd67da80 100644 --- a/src/libs/zbxdbhigh/host.c +++ b/src/libs/zbxdbhigh/host.c @@ -728,7 +728,6 @@ static int DBdelete_trigger( DBexecute("delete from trigger_depends where triggerid_up=" ZBX_FS_UI64, triggerid); DBexecute("delete from functions where triggerid=" ZBX_FS_UI64, triggerid); DBexecute("delete from events where objectid=" ZBX_FS_UI64 " and object=%i", triggerid, EVENT_OBJECT_TRIGGER); - DBexecute("delete from alerts where triggerid=" ZBX_FS_UI64, triggerid); DBexecute("delete from sysmaps_link_triggers where triggerid=" ZBX_FS_UI64, triggerid); diff --git a/src/zabbix_server/events.c b/src/zabbix_server/events.c index 7c5880ac..3b590ed3 100644 --- a/src/zabbix_server/events.c +++ b/src/zabbix_server/events.c @@ -185,8 +185,8 @@ int process_event(DB_EVENT *event) /* Cancel currently active alerts */ /* if(event->value == TRIGGER_VALUE_FALSE || event->value == TRIGGER_VALUE_TRUE) { - DBexecute("update alerts set retries=3,error='Trigger changed its status. Will not send repeats.' where triggerid=" ZBX_FS_UI64 " and repeats>0 and status=%d", - event->triggerid, ALERT_STATUS_NOT_SENT); + DBexecute("update alerts set retries=3,error='Trigger changed its status. Will not send repeats.' where eventid=" ZBX_FS_UI64 " and repeats>0 and status=%d", + event->eventid, ALERT_STATUS_NOT_SENT); }*/ if(event->skip_actions == 0) |