Changeset 16231 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Jan 24, 2008, 5:46:45 PM (18 years ago)

Author:

eugene

Message:

fix the log/trace to work with ​file://, path://, neb://

File:

• trunk/psModules/src/config/pmConfig.c (modified) (4 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -463 +463 @@
         }
 
+        // set the log file from the config files or -log argument
+        psString logDest = NULL;
         argNum = psArgumentGet(*argc, argv, "-log");
         if (argNum > 0) {
@@ -470 +472 @@
                           "--- ignored.\n");
             } else {
-                config->logFD = psMessageDestination(argv[argNum]);
-                psArgumentRemove(argNum, argc, argv);
+                logDest = pmConfigConvertFilename (argv[argNum], config, true);
+                psArgumentRemove(argNum, argc, argv);
             }
         } else {
             // Set logging destination
-            psString logDest = psMetadataLookupStr(&mdok, config->site, "LOGDEST");
-            if (mdok && logDest && strlen(logDest) > 0) {
-                config->logFD = psMessageDestination(logDest);
-            }
-        }
+            psString tmpName = psMetadataLookupStr(&mdok, config->site, "LOGDEST");
+            if (mdok && tmpName && strlen(tmpName) > 0) {
+                logDest = pmConfigConvertFilename (tmpName, config, true);
+            }
+        }
+        if (logDest) {
+            if (strcasecmp (logDest, "stdout") && strcasecmp (logDest, "stderr")) {
+                // psMessageDestination takes a target of the form file:location
+                // XXX should we modify psMessageDestination to recognize a plain file?
+                psStringPrepend (&logDest, "file:");
+            }
+            config->logFD = psMessageDestination(logDest);
+        }
         if (!psLogSetDestination(config->logFD)) {
-            psWarning("Unable to set log destination to file number %d --- ignored", config->logFD);
-        }
+            psWarning("Unable to set log destination to file number %d (%s) --- ignored", config->logFD, logDest);
+            // XXX make this a fatal error?
+        }
+        psFree (logDest);
 
         // Set trace levels
@@ -510 +522 @@
 
         // Set trace destinations
+        psString traceDest = NULL;
         argNum = psArgumentGet(*argc, argv, "-tracedest");
         if (argNum > 0) {
@@ -517 +530 @@
                           "--- ignored.\n");
             } else {
-                config->traceFD = psMessageDestination(argv[argNum]);
+                traceDest = pmConfigConvertFilename (argv[argNum], config, true);
                 psArgumentRemove(argNum, argc, argv);
             }
         } else {
-            psString traceDest = psMetadataLookupStr(&mdok, config->site, "TRACEDEST");
-            if (mdok && traceDest && strlen(traceDest) > 0) {
+            psString tmpName = psMetadataLookupStr(&mdok, config->site, "TRACEDEST");
+            if (mdok && tmpName && strlen(tmpName) > 0) {
+                traceDest = pmConfigConvertFilename (tmpName, config, true);
                 psTrace("psModules.config", 7, "Setting trace destination to %s\n", traceDest);
-                config->traceFD = psMessageDestination(traceDest);
-            }
-        }
+            }
+        }
+        if (traceDest) {
+            if (strcasecmp (traceDest, "stdout") && strcasecmp (traceDest, "stderr")) {
+                // psMessageDestination takes a target of the form file:location
+                // XXX should we modify psMessageDestination to recognize a plain file?
+                psStringPrepend (&traceDest, "file:");
+            }
+            config->traceFD = psMessageDestination(traceDest);
+        }
         if (!psTraceSetDestination(config->traceFD)) {
-            psWarning("Unable to set log destination to file %d\n", config->traceFD);
-        }
+            psWarning("Unable to set trace destination to file number %d (%s)\n", config->traceFD, traceDest);
+        }
+        psFree (traceDest);
 
         // Allow command line options to override defaults for logging.