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

Timestamp:

Oct 25, 2007, 4:41:15 PM (19 years ago)

Author:

Paul Price

Message:

Adding facility for specifying trace destinations. Log and trace can now be directed to files on the command-line.

File:

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

trunk/psModules/src/config/pmConfig.c

@@ -37 +37 @@
 #define PS_DEFAULT_SITE ".ipprc"  // Default site config file
 
+#define DEFAULT_LOG STDERR_FILENO       // Default file descriptor for log messages
+#define DEFAULT_TRACE STDERR_FILENO     // Default file descriptor for trace messages
+
 static bool readCameraConfig = true;    // Read the camera config on startup (with pmConfigRead)?
 static psArray *configPath = NULL;      // Search path for configuration files
@@ -59 +62 @@
     psFree(config->arguments);
     psFree(config->database);
+
+    // Close log and trace files
+    if (config->logFD != STDOUT_FILENO && config->logFD != STDERR_FILENO) {
+        close(config->logFD);
+    }
+    if (config->traceFD != STDOUT_FILENO && config->traceFD != STDERR_FILENO) {
+        close(config->traceFD);
+    }
+
+    return;
 }
 
@@ -79 +92 @@
     config->defaultRecipe = NULL;
 
+    config->traceFD = DEFAULT_TRACE;
+    config->logFD = DEFAULT_LOG;
+
     // the file structure is used to carry pmFPAfiles
     config->files = psMetadataAlloc ();
@@ -124 +140 @@
 }
 
+
 void pmConfigSet(const char *path)
 {
@@ -144 +161 @@
     psFree(configPath);
     configPath = NULL;
+
+    return;
 }
 
@@ -379 +398 @@
         psArgumentRemove(argNum, argc, argv);
         if (argNum >= *argc) {
-            psLogMsg("psModules.config", PS_LOG_WARN,
-                     "-site command-line switch provided without the required filename --- ignored.\n");
+            psWarning("-site command-line switch provided without the required filename --- ignored.\n");
         } else {
             siteName = psStringCopy(argv[argNum]);
@@ -446 +464 @@
 
         argNum = psArgumentGet(*argc, argv, "-log");
-        if (argNum > 0)
-        {
+        if (argNum > 0) {
             psArgumentRemove(argNum, argc, argv);
             if (argNum >= *argc) {
-                psLogMsg("psModules.config", PS_LOG_WARN, "-log command-line switch provided without the "
-                         "required log destination --- ignored.\n");
+                psWarning("-log command-line switch provided without the required log destination "
+                          "--- ignored.\n");
             } else {
-                if (!psLogSetDestination(psMessageDestination(argv[argNum]))) {
-                    psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set log destination to %s\n",
-                             argv[argNum]);
-                }
+                config->logFD = psMessageDestination(argv[argNum]);
                 psArgumentRemove(argNum, argc, argv);
             }
-        } else
-        {
+        } else {
             // Set logging destination
             psString logDest = psMetadataLookupStr(&mdok, config->site, "LOGDEST");
             if (mdok && logDest && strlen(logDest) > 0) {
-                // XXX: Only stdout and stderr are provided for now; this section should be
-                // expanded in the future to do files, and perhaps even sockets.
-                if (!psLogSetDestination(psMessageDestination(logDest))) {
-                    psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set log destination to %s\n",
-                             argv[argNum]);
-                }
-            }
+                config->logFD = psMessageDestination(logDest);
+            }
+        }
+        if (!psLogSetDestination(config->logFD)) {
+            psWarning("Unable to set log destination to file number %d --- ignored", config->logFD);
         }
 
         // Set trace levels
         psMetadata *trace = psMetadataLookupMetadata(&mdok, config->site, "TRACE");
-        if (mdok && trace)
-        {
+        if (mdok && trace) {
             psMetadataIterator *traceIter = psMetadataIteratorAlloc(trace, PS_LIST_HEAD, NULL); // Iterator
             psMetadataItem *traceItem = NULL; // Item from MD iteration
             while ((traceItem = psMetadataGetAndIncrement(traceIter))) {
                 if (traceItem->type != PS_DATA_S32) {
-                    psLogMsg("psModules.config", PS_LOG_WARN,
-                             "The level for trace component %s is not of type S32 (%x)\n",
+                    psWarning("The level for trace component %s is not of type S32 (%x)\n",
                              traceItem->name, traceItem->type);
                     continue;
                 }
-                psTrace("psModules.config", 7, "Setting trace level for %s to %d\n", traceItem->name, traceItem->data.S32);
+                psTrace("psModules.config", 7, "Setting trace level for %s to %d\n",
+                        traceItem->name, traceItem->data.S32);
                 (void)psTraceSetLevel(traceItem->name, traceItem->data.S32);
             }
@@ -494 +504 @@
         // Set trace formats
         psString traceFormat = psMetadataLookupStr(&mdok, config->site, "TRACEFORMAT");
-        if (mdok && traceFormat)
-        {
+        if (mdok && traceFormat) {
             psTrace("psModules.config", 7, "Setting trace format to %s\n", traceFormat);
             (void)psTraceSetFormat(traceFormat);
@@ -502 +511 @@
         // Set trace destinations
         #ifndef PS_NO_TRACE
-        psString traceDest = psMetadataLookupStr(&mdok, config->site, "TRACEDEST");
-        if (mdok && traceDest && strlen(traceDest) > 0)
-        {
-            psTrace("psModules.config", 7, "Setting trace destination to %s\n", traceDest);
-            // XXX: Only stdout and stderr are provided for now; this section should be
-            // expanded in the future to do files, and perhaps even sockets.
-            if (!psTraceSetDestination(psMessageDestination(traceDest))) {
-                psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set trace destination to %s\n", traceDest);
-
-            }
+        argNum = psArgumentGet(*argc, argv, "-tracedest");
+        if (argNum > 0) {
+            psArgumentRemove(argNum, argc, argv);
+            if (argNum >= *argc) {
+                psWarning("-tracedest command-line switch provided without the required trace destination "
+                          "--- ignored.\n");
+            } else {
+                config->traceFD = psMessageDestination(argv[argNum]);
+                psArgumentRemove(argNum, argc, argv);
+            }
+        } else {
+            psString traceDest = psMetadataLookupStr(&mdok, config->site, "TRACEDEST");
+            if (mdok && traceDest && strlen(traceDest) > 0) {
+                psTrace("psModules.config", 7, "Setting trace destination to %s\n", traceDest);
+                config->traceFD = psMessageDestination(traceDest);
+            }
+        }
+        if (!psTraceSetDestination(config->traceFD)) {
+            psWarning("Unable to set log destination to file %d\n", config->traceFD);
         }
         #endif
@@ -741 +759 @@
         psArgumentRemove(argNum, argc, argv);
         if (argNum >= *argc) {
-            psLogMsg("psModules.config", PS_LOG_WARN,
-                     "-dbserver command-line switch provided without the required server name --- ");
+            psWarning("-dbserver command-line switch provided without the required server name --- ");
         } else {
             char *dbserver = argv[argNum]; // The camera configuration file to read
             if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBSERVER", PS_META_REPLACE, NULL, dbserver)) {
-                psLogMsg("psModules.config", PS_LOG_WARN,
-                         "failed to overwrite .ipprc DBSERVER value --- ");
+                psWarning("Failed to overwrite .ipprc DBSERVER value");
             }
 
@@ -758 +774 @@
         psArgumentRemove(argNum, argc, argv);
         if (argNum >= *argc) {
-            psLogMsg("psModules.config", PS_LOG_WARN,
-                     "-dbname command-line switch provided without the required database name --- ");
+            psWarning("-dbname command-line switch provided without the required database name");
         } else {
             char *dbname = argv[argNum]; // The camera configuration file to read
             if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBNAME", PS_META_REPLACE, NULL, dbname)) {
-                psLogMsg("psModules.config", PS_LOG_WARN,
-                         "failed to overwrite .ipprc DBNAME value --- ");
+                psWarning("Failed to overwrite .ipprc DBNAME value");
             }
 
@@ -775 +789 @@
         psArgumentRemove(argNum, argc, argv);
         if (argNum >= *argc) {
-            psLogMsg("psModules.config", PS_LOG_WARN,
-                     "-dbuser command-line switch provided without the required database name --- ");
+            psWarning("-dbuser command-line switch provided without the required database name");
         } else {
             char *dbuser = argv[argNum]; // The camera configuration file to read
             if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBUSER", PS_META_REPLACE, NULL, dbuser)) {
-                psLogMsg("psModules.config", PS_LOG_WARN,
-                         "failed to overwrite .ipprc DBUSER value --- ");
+                psWarning("Failed to overwrite .ipprc DBUSER value");
             }
 
@@ -792 +804 @@
         psArgumentRemove(argNum, argc, argv);
         if (argNum >= *argc) {
-            psLogMsg("psModules.config", PS_LOG_WARN,
-                     "-dbpassword command-line switch provided without the required password --- ");
+            psWarning("-dbpassword command-line switch provided without the required password");
         } else {
             char *dbpassword = argv[argNum]; // The camera configuration file to read
-            if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBPASSWORD", PS_META_REPLACE, NULL, dbpassword)) {
-                psLogMsg("psModules.config", PS_LOG_WARN,
-                         "failed to overwrite .ipprc DBPASSWORD value --- ");
+            if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBPASSWORD", PS_META_REPLACE,
+                                  NULL, dbpassword)) {
+                psWarning("Failed to overwrite .ipprc DBPASSWORD value");
             }
 
@@ -809 +820 @@
         psArgumentRemove(argNum, argc, argv);
         if (argNum >= *argc) {
-            psLogMsg("psModules.config", PS_LOG_WARN,
-                     "-dbpport command-line switch provided without the required port number --- ");
+            psWarning("-dbpport command-line switch provided without the required port number");
         } else {
             char *dbport = argv[argNum]; // The camera configuration file to read
-            if (!psMetadataAddS32(config->site, PS_LIST_TAIL, "DBPORT", PS_META_REPLACE, NULL, (psS32)atoi(dbport))) {
-                psLogMsg("psModules.config", PS_LOG_WARN,
-                         "failed to overwrite .ipprc DBPORT value --- ");
+            if (!psMetadataAddS32(config->site, PS_LIST_TAIL, "DBPORT", PS_META_REPLACE, NULL,
+                                  (psS32)atoi(dbport))) {
+                psWarning("Failed to overwrite .ipprc DBPORT value");
             }
 
@@ -963 +973 @@
                 result = true;
             } else {
-                psLogMsg("psModules.config", PS_LOG_WARN,
-                         "Camera %s, format %s also matches header --- ignored.\n",
+                psWarning("Camera %s, format %s also matches header --- ignored.\n",
                          cameraName, formatsItem->name);
             }
@@ -1087 +1096 @@
 
     if (!pmConfigFileRead(&camera, cameraPath, cameraName)) {
-        psLogMsg("psModules.config", PS_LOG_WARN, "Trouble reading reading camera configuration %s", cameraName);
+        psWarning("Trouble reading reading camera configuration %s", cameraName);
         psFree(camera);
         return NULL;
@@ -1124 +1133 @@
     }
     if (!(mdStatus01 && mdStatus02 && mdStatus03 && mdStatus04)) {
-        psLogMsg("psModules.config", PS_LOG_WARN,
-                 "Could not determine database server, name, user, and password from site metadata.\n");
+        psWarning("Could not determine database server, name, user, and password from site metadata.\n");
         return NULL;
     }