[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. a6700cad43acfe8707a50af2a3f7f4f62f211019

git at labs.omniti.com git at labs.omniti.com
Tue Feb 28 19:43:05 EST 2012


Pushed by: jesus
The branch, master has been updated
       via  a6700cad43acfe8707a50af2a3f7f4f62f211019 (commit)
       via  8645a578630798b9859f7cdccef6c78300efae11 (commit)
      from  c4bfda41ac34a173e53c73725b8ccc799eb29bba (commit)

Summary of changes:
 src/modules/external_proc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Log:
commit a6700cad43acfe8707a50af2a3f7f4f62f211019
Merge: c4bfda4 8645a57
Author: Theo Schlossnagle <jesus at lethargy.org>
Date:   Tue Feb 28 16:42:32 2012 -0800

    Merge pull request #50 from TheTeaWeevil/master
    
    Fix to signal handling for external modules


commit 8645a578630798b9859f7cdccef6c78300efae11
Author: Philip Maddox <pmaddox at circonus.com>
Date:   Tue Feb 28 16:44:34 2012 -0500

    Fixed a bug in the external module where the main handling thread would only allow one interruption by moving the signal handling setup into the loop.

diff --git a/src/modules/external_proc.c b/src/modules/external_proc.c
index 0a53270..86e62d8 100644
--- a/src/modules/external_proc.c
+++ b/src/modules/external_proc.c
@@ -248,7 +248,6 @@ int external_child(external_data_t *data) {
     return -1;
   }
 
-  signal(SIGCHLD, external_sigchld);
   noit_skiplist_init(&active_procs);
   noit_skiplist_set_compare(&active_procs, __proc_state_check_no,
                             __proc_state_check_no_key);
@@ -265,6 +264,8 @@ int external_child(external_data_t *data) {
     int16_t argcnt, *arglens, envcnt, *envlens;
     int i;
 
+    signal(SIGCHLD, external_sigchld);
+
     /* We poll here so that we can be interrupted by the SIGCHLD */
     pfd.fd = in_fd;
     pfd.events = POLLIN;




hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list