summaryrefslogtreecommitdiffstats
path: root/include/functions.c
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2004-01-20 20:34:51 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2004-01-20 20:34:51 +0000
commit7c3481673917e3d1fc98eef73c3b2c93026d3f98 (patch)
treeedc9bf364a1bd6a1a2ecdfb0089991fb515e1c1a /include/functions.c
parentc68425e9b1594925072430df39c55f185f8ac389 (diff)
downloadzabbix-7c3481673917e3d1fc98eef73c3b2c93026d3f98.tar.gz
zabbix-7c3481673917e3d1fc98eef73c3b2c93026d3f98.tar.xz
zabbix-7c3481673917e3d1fc98eef73c3b2c93026d3f98.zip
- added substitution of macros for all actions (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1195 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include/functions.c')
-rw-r--r--include/functions.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/functions.c b/include/functions.c
index 8e407933..70e137ec 100644
--- a/include/functions.c
+++ b/include/functions.c
@@ -922,6 +922,9 @@ void apply_actions(DB_TRIGGER *trigger,int good)
}
strscpy(action.message,action.subject);
+ substitute_macros(trigger, &action, action.message);
+ substitute_macros(trigger, &action, action.subject);
+
/* substitute_hostname(trigger->triggerid,action.message);
substitute_hostname(trigger->triggerid,action.subject);*/
}
@@ -944,6 +947,9 @@ void apply_actions(DB_TRIGGER *trigger,int good)
}
strscpy(action.message,action.subject);
+ substitute_macros(trigger, &action, action.message);
+ substitute_macros(trigger, &action, action.subject);
+
/* substitute_hostname(trigger->triggerid,action.message);
substitute_hostname(trigger->triggerid,action.subject);*/
}