diff options
| author |  Sven Nierlein <sven@nierlein.de>
| 2019-02-15 10:36:28 +0100 |
|---|---|---|
| committer | Sven Nierlein <sven@nierlein.de>
| 2019-02-15 10:36:28 +0100 |
| commit | 7cafb0e84550035fe671662c293122be975065ca (patch) | |
| tree | 5d80a8e80854edc41a72da668a89485505d7e5dc /plugins/utils.c | |
| parent | 2962148d8bac3a65f1fb5e1a948e3f0a86a42a1a (diff) | |
| download | monitoring-plugins-7cafb0e84550035fe671662c293122be975065ca.tar.gz | |
check_by_ssh: fix child process leak on timeouts
When check_by_ssh runs into a timeout it simply exits keeping all child processes running.
Simply adopting the kill loop from runcmd_timeout_alarm_handler() fixes this.
Signed-off-by: Sven Nierlein <sven@nierlein.de>
Diffstat (limited to 'plugins/utils.c')
| -rw-r--r-- | plugins/utils.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/plugins/utils.c b/plugins/utils.c index 231af92b..ee620133 100644 --- a/plugins/utils.c +++ b/plugins/utils.c @@ -36,9 +36,6 @@ extern const char *progname; #define STRLEN 64 #define TXTBLK 128 -unsigned int timeout_state = STATE_CRITICAL; -unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT; - time_t start_time, end_time; /* ************************************************************************** @@ -148,33 +145,6 @@ print_revision (const char *command_name, const char *revision) command_name, revision, PACKAGE, VERSION); } -const char * -state_text (int result) -{ - switch (result) { - case STATE_OK: - return "OK"; - case STATE_WARNING: - return "WARNING"; - case STATE_CRITICAL: - return "CRITICAL"; - case STATE_DEPENDENT: - return "DEPENDENT"; - default: - return "UNKNOWN"; - } -} - -void -timeout_alarm_handler (int signo) -{ - if (signo == SIGALRM) { - printf (_("%s - Plugin timed out after %d seconds\n"), - state_text(timeout_state), timeout_interval); - exit (timeout_state); - } -} - int is_numeric (char *number) { @@ -708,4 +678,3 @@ char *sperfdata_int (const char *label, return data; } - |