You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2012/12/04 00:10:23 UTC
[1/4] git commit: Handle SIGINT the same way as SIGTERM
Updated Branches:
refs/heads/3.2.x a7c0a423a -> 1bb25c51e
Handle SIGINT the same way as SIGTERM
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/11c34dab
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/11c34dab
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/11c34dab
Branch: refs/heads/3.2.x
Commit: 11c34daba5586096e794462b98db7e3b0185e8ac
Parents: 47aca7e
Author: Igor Galić <i....@brainsware.org>
Authored: Tue Oct 30 22:29:46 2012 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Mon Dec 3 23:35:54 2012 +0100
----------------------------------------------------------------------
cop/TrafficCop.cc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/11c34dab/cop/TrafficCop.cc
----------------------------------------------------------------------
diff --git a/cop/TrafficCop.cc b/cop/TrafficCop.cc
index 60964fc..12c89d3 100644
--- a/cop/TrafficCop.cc
+++ b/cop/TrafficCop.cc
@@ -1687,13 +1687,14 @@ init_signals()
struct sigaction action;
cop_log_trace("Entering init_signals()\n");
- // Handle the SIGTERM signal: We simply do the same as
- // in sig_child..
+ // Handle the SIGTERM and SIGINT signal:
+ // We kill the process group and wait() for all children
action.sa_handler = sig_term;
sigemptyset(&action.sa_mask);
action.sa_flags = 0;
sigaction(SIGTERM, &action, NULL);
+ sigaction(SIGINT, &action, NULL);
// Handle the SIGCHLD signal. We simply reap all children that
// die (which should only be spawned traffic_manager's).
Re: [1/4] git commit: Handle SIGINT the same way as SIGTERM
Posted by Igor Galić <i....@brainsware.org>.
I'm very sorry for the noise!
Neither was this supposed to go out, nor do I know how it
happened, but it's now reverted!
i
----- Original Message -----
> Updated Branches:
> refs/heads/3.2.x a7c0a423a -> 1bb25c51e
>
>
> Handle SIGINT the same way as SIGTERM
>
>
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/trafficserver/commit/11c34dab
> Tree:
> http://git-wip-us.apache.org/repos/asf/trafficserver/tree/11c34dab
> Diff:
> http://git-wip-us.apache.org/repos/asf/trafficserver/diff/11c34dab
>
> Branch: refs/heads/3.2.x
> Commit: 11c34daba5586096e794462b98db7e3b0185e8ac
> Parents: 47aca7e
> Author: Igor Gali�� <i....@brainsware.org>
> Authored: Tue Oct 30 22:29:46 2012 +0100
> Committer: Igor Gali�� <i....@brainsware.org>
> Committed: Mon Dec 3 23:35:54 2012 +0100
>
> ----------------------------------------------------------------------
> cop/TrafficCop.cc | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/11c34dab/cop/TrafficCop.cc
> ----------------------------------------------------------------------
> diff --git a/cop/TrafficCop.cc b/cop/TrafficCop.cc
> index 60964fc..12c89d3 100644
> --- a/cop/TrafficCop.cc
> +++ b/cop/TrafficCop.cc
> @@ -1687,13 +1687,14 @@ init_signals()
> struct sigaction action;
>
> cop_log_trace("Entering init_signals()\n");
> - // Handle the SIGTERM signal: We simply do the same as
> - // in sig_child..
> + // Handle the SIGTERM and SIGINT signal:
> + // We kill the process group and wait() for all children
> action.sa_handler = sig_term;
> sigemptyset(&action.sa_mask);
> action.sa_flags = 0;
>
> sigaction(SIGTERM, &action, NULL);
> + sigaction(SIGINT, &action, NULL);
>
> // Handle the SIGCHLD signal. We simply reap all children that
> // die (which should only be spawned traffic_manager's).
>
>
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE