Patch from Scott McKellar:
[OpenSRF.git] / src / libopensrf / osrf_system.c
index de25a29..136558f 100644 (file)
@@ -3,11 +3,23 @@
 #include <opensrf/osrf_prefork.h>
 #include <signal.h>
 
-static int _osrfSystemInitCache( void );
 static void report_child_status( pid_t pid, int status );
 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;
@@ -34,20 +46,11 @@ void osrfSystemIgnoreTransportClient() {
        osrfGlobalTransportClient = NULL;
 }
 
-transport_client* osrf_system_get_transport_client( void ) {
-       return osrfGlobalTransportClient;
-}
-
 int osrf_system_bootstrap_client( char* config_file, char* contextnode ) {
-       return osrf_system_bootstrap_client_resc(config_file, contextnode, NULL);
-}
-
-int osrfSystemBootstrapClientResc( char* config_file, char* contextnode, char* resource ) {
-       return osrf_system_bootstrap_client_resc( config_file, contextnode, resource );
+       return osrfSystemBootstrapClientResc(config_file, contextnode, NULL);
 }
 
-
-static int _osrfSystemInitCache( void ) {
+int osrfSystemInitCache( void ) {
 
        jsonObject* cacheServers = osrf_settings_host_value_object("/cache/global/servers/server");
        char* maxCache = osrf_settings_host_value("/cache/global/max_cache_time");
@@ -56,7 +59,7 @@ static int _osrfSystemInitCache( void ) {
 
                if( cacheServers->type == JSON_ARRAY ) {
                        int i;
-                       char* servers[cacheServers->size];
+                       const char* servers[cacheServers->size];
                        for( i = 0; i != cacheServers->size; i++ ) {
                                servers[i] = jsonObjectGetString( jsonObjectGetIndex(cacheServers, i) );
                                osrfLogInfo( OSRF_LOG_MARK, "Adding cache server %s", servers[i]);
@@ -64,7 +67,7 @@ static int _osrfSystemInitCache( void ) {
                        osrfCacheInit( servers, cacheServers->size, atoi(maxCache) );
 
                } else {
-                       char* servers[] = { jsonObjectGetString(cacheServers) };                
+                       const char* servers[] = { jsonObjectGetString(cacheServers) };          
                        osrfLogInfo( OSRF_LOG_MARK, "Adding cache server %s", servers[0]);
                        osrfCacheInit( servers, 1, atoi(maxCache) );
                }
@@ -107,8 +110,6 @@ int osrfSystemBootstrap( char* hostname, char* configfile, char* contextNode ) {
        jsonObject* apps = osrf_settings_host_value_object("/activeapps/appname");
        osrfStringArray* arr = osrfNewStringArray(8);
        
-       _osrfSystemInitCache();
-
        if(apps) {
                int i = 0;
 
@@ -116,7 +117,7 @@ int osrfSystemBootstrap( char* hostname, char* configfile, char* contextNode ) {
                        osrfStringArrayAdd(arr, jsonObjectGetString(apps));
 
                } else {
-                       jsonObject* app;
+                       const jsonObject* app;
                        while( (app = jsonObjectGetIndex(apps, i++)) ) 
                                osrfStringArrayAdd(arr, jsonObjectGetString(app));
                }
@@ -159,6 +160,11 @@ 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);
+
+    signal(SIGTERM, handleKillSignal);
+    signal(SIGINT, handleKillSignal);
+       
        while(1) {
                errno = 0;
                int status;
@@ -295,7 +301,7 @@ static ChildNode* seek_child( pid_t pid ) {
 /*----------- End of routines to manage list of children --*/
 
 
-int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, char* resource ) {
+int osrfSystemBootstrapClientResc( char* config_file, char* contextnode, char* resource ) {
 
        int failure = 0;
 
@@ -319,9 +325,15 @@ int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, cha
 
 
        char* log_file          = osrfConfigGetValue( NULL, "/logfile");
+       if(!log_file) {
+               fprintf(stderr, "No log file specified in configuration file %s\n",
+                               config_file);
+               return -1;
+       }
+
        char* log_level         = osrfConfigGetValue( NULL, "/loglevel" );
        osrfStringArray* arr    = osrfNewStringArray(8);
-       osrfConfigGetValueList(NULL, arr, "/domains/domain");
+       osrfConfigGetValueList(NULL, arr, "/domain");
 
        char* username          = osrfConfigGetValue( NULL, "/username" );
        char* password          = osrfConfigGetValue( NULL, "/passwd" );
@@ -330,19 +342,6 @@ int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, cha
        char* facility          = osrfConfigGetValue( NULL, "/syslog" );
        char* actlog            = osrfConfigGetValue( NULL, "/actlog" );
 
-       if(!log_file) {
-               fprintf(stderr, "No log file specified in configuration file %s\n",
-                          config_file);
-               free(log_level);
-               free(username);
-               free(password);
-               free(port);
-               free(unixpath);
-               free(facility);
-               free(actlog);
-               return -1;
-       }
-
        /* if we're a source-client, tell the logger */
        char* isclient = osrfConfigGetValue(NULL, "/client");
        if( isclient && !strcasecmp(isclient,"true") )
@@ -394,6 +393,7 @@ int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, cha
 
        if (failure) {
                osrfStringArrayFree(arr);
+               free(log_file);
                free(log_level);
                free(username);
                free(password);