diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-05-27 09:43:39 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-05-27 09:43:39 +0000 |
| commit | 8b24becc7c7227da032e472e5b077c80e0eef1dd (patch) | |
| tree | 85c6a33352a98af38856af4af4a95f8ba2489900 /src | |
| parent | 70f35ff303e4c22ff4e38d42953f2008f10824da (diff) | |
| download | zabbix-8b24becc7c7227da032e472e5b077c80e0eef1dd.tar.gz zabbix-8b24becc7c7227da032e472e5b077c80e0eef1dd.tar.xz zabbix-8b24becc7c7227da032e472e5b077c80e0eef1dd.zip | |
- [DEV-173] added support of notification escalations on server side
git-svn-id: svn://svn.zabbix.com/trunk@5728 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_server/escalator/escalator.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c index 81b730d9..b2663f86 100644 --- a/src/zabbix_server/escalator/escalator.c +++ b/src/zabbix_server/escalator/escalator.c @@ -134,6 +134,7 @@ static void add_message_alert(DB_ESCALATION *escalation, DB_EVENT *event, DB_ACT char *subject_esc = NULL; char *message_esc = NULL; char *error_esc = NULL; + char error[MAX_STRING_LEN]; zabbix_log(LOG_LEVEL_DEBUG, "In add_message_alert()"); /* zabbix_log(LOG_LEVEL_DEBUG,"MESSAGE\n\tuserid : " ZBX_FS_UI64 "\n\tsubject: %s\n\tmessage: %s", userid, subject, message);*/ @@ -194,8 +195,21 @@ static void add_message_alert(DB_ESCALATION *escalation, DB_EVENT *event, DB_ACT DBfree_result(result); if (0 == medias) { + result = DBselect("select name,surname,alias from users where userid=" ZBX_FS_UI64, + userid); + + if (NULL != (row = DBfetch(result))) { + zbx_snprintf(error, sizeof(error), "No media defined for user %s %s (%s)", + row[0], + row[1], + row[2]); + } else + zbx_snprintf(error, sizeof(error), "No media defined"); + + DBfree_result(result); + alertid = DBget_maxid("alerts", "alertid"); - error_esc = DBdyn_escape_string("No media defined"); + error_esc = DBdyn_escape_string(error); DBexecute("insert into alerts (alertid,actionid,eventid,userid,clock" ",subject,message,status,alerttype,error,esc_step)" |