diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2003-05-26 19:18:32 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2003-05-26 19:18:32 +0000 |
| commit | 66e30e42a006bdb1d32d336ba6641fd58df14ce6 (patch) | |
| tree | 3017f50dcda803b58102b1b52f9cc0a0dbfd25b7 /src | |
| parent | 3d56e269f4dab81972078b072e4a28a50e50f3f4 (diff) | |
| download | zabbix-66e30e42a006bdb1d32d336ba6641fd58df14ce6.tar.gz zabbix-66e30e42a006bdb1d32d336ba6641fd58df14ce6.tar.xz zabbix-66e30e42a006bdb1d32d336ba6641fd58df14ce6.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@782 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_sucker/alerter.c | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/src/zabbix_sucker/alerter.c b/src/zabbix_sucker/alerter.c index 768f03c5..7acfbc9f 100644 --- a/src/zabbix_sucker/alerter.c +++ b/src/zabbix_sucker/alerter.c @@ -27,6 +27,8 @@ #include <sys/socket.h> #include <netinet/in.h> +#include <sys/wait.h> + #include <string.h> #ifdef HAVE_NETDB_H @@ -52,8 +54,10 @@ int send_alert(DB_ALERT *alert,DB_MEDIATYPE *mediatype) { int res=FAIL; + struct sigaction phan; + int pid; - zabbix_log( LOG_LEVEL_DEBUG, "In send_alert()"); + zabbix_log( LOG_LEVEL_ERR, "In send_alert()"); if(mediatype->type==ALERT_TYPE_EMAIL) { @@ -62,15 +66,34 @@ int send_alert(DB_ALERT *alert,DB_MEDIATYPE *mediatype) else if(mediatype->type==ALERT_TYPE_EXEC) { /* if(-1 == execl(CONFIG_ALERT_SCRIPTS_PATH,mediatype->exec_path,alert->sendto,alert->subject,alert->message))*/ - zabbix_log( LOG_LEVEL_DEBUG, "Before execl([%s],[%s])",CONFIG_ALERT_SCRIPTS_PATH,mediatype->exec_path); - if(-1 == execlp("/home/zabbix/bin/","lmt.sh")) + zabbix_log( LOG_LEVEL_ERR, "Before execl([%s],[%s])",CONFIG_ALERT_SCRIPTS_PATH,mediatype->exec_path); + +/* phan.sa_handler = &signal_handler;*/ + signal( SIGCHLD, SIG_IGN ); + +/* sigemptyset(&phan.sa_mask); + phan.sa_flags = 0; + sigaction(SIGCHLD, &phan, NULL);*/ + +/* if(-1 == execl("/home/zabbix/bin/lmt.sh","lmt.sh",alert->sendto,alert->subject,alert->message,(char *)0))*/ + + pid=fork(); + if(0 != pid) { - zabbix_log( LOG_LEVEL_ERR, "Error executing [%s] in [%s] [%m]", mediatype->exec_path,CONFIG_ALERT_SCRIPTS_PATH); - res = FAIL; + waitpid(pid,NULL,0); } else { - res = SUCCEED; + if(-1 == execl("/bin/sh","-c","/home/zabbix/bin/lmt.sh",alert->sendto,alert->subject,alert->message,(char *)0)) + { + zabbix_log( LOG_LEVEL_ERR, "Error executing [%s] in [%s] [%m]", mediatype->exec_path,CONFIG_ALERT_SCRIPTS_PATH); + res = FAIL; + } + else + { + res = SUCCEED; + } + exit(0); } } else |