diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-08-02 19:40:26 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-08-02 19:40:26 +0000 |
| commit | cd67d861e153d9c9ccde3e1198964d8ce573f3cc (patch) | |
| tree | a7ce9fb1309fd0442659c92cfa937c55fa6c46f1 /src | |
| parent | 24a66d8ea76716dfdaa32a6350832dc1e3cb6f1e (diff) | |
| download | zabbix-cd67d861e153d9c9ccde3e1198964d8ce573f3cc.tar.gz zabbix-cd67d861e153d9c9ccde3e1198964d8ce573f3cc.tar.xz zabbix-cd67d861e153d9c9ccde3e1198964d8ce573f3cc.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@1926 97f52cf1-0a1b-0410-bd0e-c28be96e8082
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 { |