diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_server/actions.c | 4 | ||||
| -rw-r--r-- | src/zabbix_server/escalator/escalator.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c index b949047e..5144bb61 100644 --- a/src/zabbix_server/actions.c +++ b/src/zabbix_server/actions.c @@ -205,7 +205,7 @@ static void send_to_user(DB_TRIGGER *trigger,DB_ACTION *action) } } -void apply_actions(DB_TRIGGER *trigger,int alarmid,int trigger_value) +void apply_actions_new(DB_TRIGGER *trigger,int alarmid,int trigger_value) { int escalationid; char sql[MAX_STRING_LEN]; @@ -227,7 +227,7 @@ void apply_actions(DB_TRIGGER *trigger,int alarmid,int trigger_value) * Apply actions if any. */ /*void apply_actions(int triggerid,int good)*/ -void apply_actions_old(DB_TRIGGER *trigger,int alarmid,int trigger_value) +void apply_actions(DB_TRIGGER *trigger,int alarmid,int trigger_value) { DB_RESULT *result,*result2,*result3; diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c index cedf74d9..fa47dc96 100644 --- a/src/zabbix_server/escalator/escalator.c +++ b/src/zabbix_server/escalator/escalator.c @@ -101,7 +101,7 @@ static int process_escalation(DB_ESCALATION_LOG *escalation_log) zabbix_log( LOG_LEVEL_WARNING, "ESCALATION_ACTION_EXEC_ACTION"); if(DBget_trigger_by_triggerid(escalation_log->triggerid,&trigger) == SUCCEED) { - apply_actions_old(&trigger,escalation_log->alarmid,TRIGGER_VALUE_TRUE); + apply_actions(&trigger,escalation_log->alarmid,TRIGGER_VALUE_TRUE); } else { |