diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2002-07-23 17:06:33 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2002-07-23 17:06:33 +0000 |
| commit | ce2bf1099ecb5b4087184a88c8cf648a034ab690 (patch) | |
| tree | d1658c16a0f82736c5543d3564e2580ed6d18258 /src | |
| parent | 18f62b7d06dedf74b30899302019e847ab287183 (diff) | |
- fixed crash in case if MySQL server gone (support for signal PIPE) (Alexei)
Thanks to Arturs.
- fixed duplicate triggers in Availability Report (Alexei)
- fixed division by zero in Availability Report (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@440 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_sucker/zabbix_sucker.c | 4 | ||||
| -rw-r--r-- | src/zabbix_trapper/zabbix_trapperd.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/zabbix_sucker/zabbix_sucker.c b/src/zabbix_sucker/zabbix_sucker.c index 051e5e87..166d718d 100644 --- a/src/zabbix_sucker/zabbix_sucker.c +++ b/src/zabbix_sucker/zabbix_sucker.c @@ -87,9 +87,9 @@ void signal_handler( int sig ) zabbix_log( LOG_LEVEL_DEBUG, "Timeout while executing operation." ); } - else if( SIGQUIT == sig || SIGINT == sig || SIGTERM == sig ) + else if( SIGQUIT == sig || SIGINT == sig || SIGTERM == sig || SIGPIPE == sig ) { - zabbix_log( LOG_LEVEL_ERR, "Got QUIT or INT or TERM signal. Exiting..." ); + zabbix_log( LOG_LEVEL_ERR, "Got QUIT or INT or TERM or PIPE signal. Exiting..." ); uninit(); exit( FAIL ); } diff --git a/src/zabbix_trapper/zabbix_trapperd.c b/src/zabbix_trapper/zabbix_trapperd.c index e820f205..7a4b3cdb 100644 --- a/src/zabbix_trapper/zabbix_trapperd.c +++ b/src/zabbix_trapper/zabbix_trapperd.c @@ -106,7 +106,7 @@ void signal_handler( int sig ) signal( SIGALRM, signal_handler ); zabbix_log( LOG_LEVEL_WARNING, "Timeout while answering request"); } - else if( SIGQUIT == sig || SIGINT == sig || SIGTERM == sig ) + else if( SIGQUIT == sig || SIGINT == sig || SIGTERM == sig || SIGPIPE == sig ) { zabbix_log( LOG_LEVEL_WARNING, "Got signal. Exiting ..."); uninit(); |