final C code logging patchups

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@585 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/libstack/osrf_system.c b/src/libstack/osrf_system.c
index acb7c34..ac698f7 100644 (file)
--- a/src/libstack/osrf_system.c
+++ b/src/libstack/osrf_system.c
@@ -155,6 +155,7 @@ int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, cha
        char* port                      = osrfConfigGetValue( NULL, "/port" );
        char* unixpath          = osrfConfigGetValue( NULL, "/unixpath" );
        char* facility          = osrfConfigGetValue( NULL, "/syslog" );
+       char* actlog            = osrfConfigGetValue( NULL, "/actlog" );
 
        char* domain = strdup(osrfStringArrayGetString( arr, 0 )); /* just the first for now */
        osrfStringArrayFree(arr);
@@ -170,6 +171,7 @@ int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, cha
        if(!strcmp(log_file, "syslog")) {
                osrfLogInit( OSRF_LOG_TYPE_SYSLOG, contextnode, llevel );
                osrfLogSetSyslogFacility(osrfLogFacilityToInt(facility));
+               if(actlog) osrfLogSetSyslogActFacility(osrfLogFacilityToInt(actlog));
 
        } else {
                osrfLogInit( OSRF_LOG_TYPE_FILE, contextnode, llevel );
@@ -197,6 +199,7 @@ int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, cha
                __osrfGlobalTransportClient = client;
        }
 
+       free(actlog);
        free(facility);
        free(log_level);
        free(log_file);

diff --git a/src/utils/log.c b/src/utils/log.c
index 194a8b3..eb6a100 100644 (file)
--- a/src/utils/log.c
+++ b/src/utils/log.c
@@ -161,14 +161,14 @@ int osrfLogFacilityToInt( char* facility ) {
        if(!facility) return LOG_LOCAL0;
        if(strlen(facility) < 6) return LOG_LOCAL0;
        switch( facility[5] ) {
-               case 0: return LOG_LOCAL0;
-               case 1: return LOG_LOCAL1;
-               case 2: return LOG_LOCAL2;
-               case 3: return LOG_LOCAL3;
-               case 4: return LOG_LOCAL4;
-               case 5: return LOG_LOCAL5;
-               case 6: return LOG_LOCAL6;
-               case 7: return LOG_LOCAL7;
+               case '0': return LOG_LOCAL0;
+               case '1': return LOG_LOCAL1;
+               case '2': return LOG_LOCAL2;
+               case '3': return LOG_LOCAL3;
+               case '4': return LOG_LOCAL4;
+               case '5': return LOG_LOCAL5;
+               case '6': return LOG_LOCAL6;
+               case '7': return LOG_LOCAL7;
        }
        return LOG_LOCAL0;
 }