From 5004ce02ddbf03d69f3f1c07b46e1d51a0e36aea Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 30 Oct 2006 08:05:27 +0000 Subject: - remove left spaces from script full path (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@3401 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- ChangeLog | 3 ++- src/zabbix_server/alerter/alerter.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1887ce17..8ea1b263 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,5 @@ Changes for 1.3: - - fixed situations when latest_alarm() may return wrong value (Alexei) - developed multitemplate system (Eugene) - developed group permission system (Eugene) - added processing of distributed events (Alexei) @@ -13,6 +12,8 @@ Changes for 1.3: Integrated from 1.1.x + - remove left spaces from script full path (Alexei) + - fixed situations when latest_alarm() may return wrong value (Alexei) - added Swedish translation. Thanks to "yeager". (Alexei) - fixed calculation of delta(#N) (Alexei) - better processing of units 's', support for units 'uptime' (Alexei) diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c index 7b22b115..ace9c3dc 100644 --- a/src/zabbix_server/alerter/alerter.c +++ b/src/zabbix_server/alerter/alerter.c @@ -107,7 +107,8 @@ static int execute_action(DB_ALERT *alert,DB_MEDIATYPE *mediatype, char *error, strscpy(full_path,CONFIG_ALERT_SCRIPTS_PATH); strncat(full_path,"/",MAX_STRING_LEN); strncat(full_path,mediatype->exec_path,MAX_STRING_LEN); - zabbix_log( LOG_LEVEL_DEBUG, "Before executing [%s] [%m]", full_path); + ltrim_spaces(full_path); + zabbix_log( LOG_LEVEL_DEBUG, "Before executing [%s]", full_path); if(-1 == execl(full_path,mediatype->exec_path,alert->sendto,alert->subject,alert->message,(char *)0)) { zabbix_log( LOG_LEVEL_ERR, "Error executing [%s] [%s]", full_path, strerror(errno)); -- cgit