diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-06-13 12:38:23 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-06-13 12:38:23 +0000 |
| commit | 6f801e6fdfe65c144446c325dd08b0c9dcd2bc7a (patch) | |
| tree | 9e334c6b51f8b7363e6143ddd3221220a2f872f3 /src | |
| parent | 16f86dd9dfde2652e2904e7fdc0fab199e3f5817 (diff) | |
| download | zabbix-6f801e6fdfe65c144446c325dd08b0c9dcd2bc7a.tar.gz zabbix-6f801e6fdfe65c144446c325dd08b0c9dcd2bc7a.tar.xz zabbix-6f801e6fdfe65c144446c325dd08b0c9dcd2bc7a.zip | |
- fixed processing of complex action conditions (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@4276 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_server/actions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c index e6df2665..85cfbb10 100644 --- a/src/zabbix_server/actions.c +++ b/src/zabbix_server/actions.c @@ -566,7 +566,7 @@ static int check_action_conditions(DB_EVENT *event, DB_ACTION *action) result = DBselect("select conditionid,actionid,conditiontype,operator,value from conditions where actionid=" ZBX_FS_UI64 " order by conditiontype", action->actionid); - while((row=DBfetch(result))) + while((row=DBfetch(result)) && (0 == exit)) { num++; @@ -635,7 +635,7 @@ static int check_action_conditions(DB_EVENT *event, DB_ACTION *action) } DBfree_result(result); - /* Ifnot conditions defined, return SUCCEED*/ + /* If no conditions defined, return SUCCEED*/ if(num == 0) ret = SUCCEED; zabbix_log( LOG_LEVEL_DEBUG, "End check_action_conditions (result:%s)", |