Patch from Scott McKellar:

[OpenSRF.git] / src / libopensrf / osrf_system.c

diff --git a/src/libopensrf/osrf_system.c b/src/libopensrf/osrf_system.c
index 6437976..136558f 100644 (file)
--- a/src/libopensrf/osrf_system.c
+++ b/src/libopensrf/osrf_system.c
@@ -7,6 +7,19 @@ static void report_child_status( pid_t pid, int status );
 struct child_node;
 typedef struct child_node ChildNode;
 
 struct child_node;
 typedef struct child_node ChildNode;
 

+static void handleKillSignal(int signo) {
+    /* we are the top-level process and we've been 
+     * killed. Kill all of our children */
+    kill(0, SIGTERM);
+    sleep(1); /* give the children a chance to die before we reap them */
+    pid_t child_pid;
+    int status;
+    while( (child_pid=waitpid(-1,&status,WNOHANG)) > 0) 
+        osrfLogInfo(OSRF_LOG_MARK, "Killed child %d", child_pid);
+    _exit(0);
+}
+
+

 struct child_node
 {
        ChildNode* pNext;
 struct child_node
 {
        ChildNode* pNext;


@@ -148,6 +161,9 @@ int osrfSystemBootstrap( char* hostname, char* configfile, char* contextNode ) {
        } // should we do something if there are no apps? does the wait(NULL) below do that for us?
 
        osrfStringArrayFree(arr);
        } // should we do something if there are no apps? does the wait(NULL) below do that for us?
 
        osrfStringArrayFree(arr);

+
+    signal(SIGTERM, handleKillSignal);
+    signal(SIGINT, handleKillSignal);

        
        while(1) {
                errno = 0;
        
        while(1) {
                errno = 0;


@@ -377,6 +393,7 @@ int osrfSystemBootstrapClientResc( char* config_file, char* contextnode, char* r
 
        if (failure) {
                osrfStringArrayFree(arr);
 
        if (failure) {
                osrfStringArrayFree(arr);

+               free(log_file);

                free(log_level);
                free(username);
                free(password);
                free(log_level);
                free(username);
                free(password);