Changeset 10460

Timestamp:

Dec 4, 2006, 4:31:24 PM (20 years ago)

Author:

magnier

Message:

changes trace/log components to psModules.config from func

File:

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

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-04 22:21:28 $
+ *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-05 02:31:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -148 +148 @@
     // find the first existing entry in the path (starting with the bare name)
     realName = psStringCopy (name);
-    psTrace (__func__, 5, "trying %s\n", realName);
+    psTrace ("psModules.config", 5, "trying %s\n", realName);
 
     int status = stat (realName, &filestat);
@@ -169 +169 @@
         realName = psStringCopy (configPath->data[i]);
         psStringAppend (&realName, "/%s", name);
-        psTrace (__func__, 5, "trying %s\n", realName);
+        psTrace ("psModules.config", 5, "trying %s\n", realName);
 
         status = stat (realName, &filestat);
@@ -234 +234 @@
         psArgumentRemove(argNum, config->argc, config->argv);
         if (argNum >= *config->argc) {
-            psLogMsg(__func__, PS_LOG_WARN,
+            psLogMsg("psModules.config", PS_LOG_WARN,
                      "-site command-line switch provided without the required filename --- ignored.\n");
         } else {
@@ -308 +308 @@
             psArgumentRemove(argNum, config->argc, config->argv);
             if (argNum >= *config->argc) {
-                psLogMsg(__func__, PS_LOG_WARN, "-log command-line switch provided without the "
+                psLogMsg("psModules.config", PS_LOG_WARN, "-log command-line switch provided without the "
                          "required log destination --- ignored.\n");
             } else {
                 if (!psLogSetDestination(psMessageDestination(config->argv[argNum]))) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Unable to set log destination to %s\n",
+                    psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set log destination to %s\n",
                              config->argv[argNum]);
                 }
@@ -325 +325 @@
                 // expanded in the future to do files, and perhaps even sockets.
                 if (!psLogSetDestination(psMessageDestination(logDest))) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Unable to set log destination to %s\n",
+                    psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set log destination to %s\n",
                              config->argv[argNum]);
                 }
@@ -339 +339 @@
             while ((traceItem = psMetadataGetAndIncrement(traceIter))) {
                 if (traceItem->type != PS_DATA_S32) {
-                    psLogMsg(__func__, PS_LOG_WARN,
+                    psLogMsg("psModules.config", PS_LOG_WARN,
                              "The level for trace component %s is not of type S32 (%x)\n",
                              traceItem->name, traceItem->type);
@@ -368 +368 @@
             // expanded in the future to do files, and perhaps even sockets.
             if (!psTraceSetDestination(psMessageDestination(traceDest))) {
-                psLogMsg(__func__, PS_LOG_WARN, "Unable to set trace destination to %s\n", traceDest);
+                psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set trace destination to %s\n", traceDest);
 
             }
@@ -417 +417 @@
         psArgumentRemove(argNum, config->argc, config->argv);
         if (argNum >= *config->argc) {
-            psLogMsg(__func__, PS_LOG_WARN,
+            psLogMsg("psModules.config", PS_LOG_WARN,
                      "-camera command-line switch provided without the required camera or filename --- "
                      "ignored.\n");
@@ -524 +524 @@
     psMetadata *formats = psMetadataLookupMetadata(&mdok, camera, "FORMATS"); // List of formats
     if (!mdok || !formats) {
-        psLogMsg(__func__, PS_LOG_WARN, "Unable to find list of FORMATS in camera %s --- ignored\n",
+        psLogMsg("psModules.config", PS_LOG_WARN, "Unable to find list of FORMATS in camera %s --- ignored\n",
                  cameraName);
         return false;
@@ -533 +533 @@
     while ((formatsItem = psMetadataGetAndIncrement(formatsIter))) {
         if (formatsItem->type != PS_DATA_STRING) {
-            psLogMsg(__func__, PS_LOG_WARN, "In camera %s, camera format %s is not of type STR --- "
+            psLogMsg("psModules.config", PS_LOG_WARN, "In camera %s, camera format %s is not of type STR --- "
                      "ignored.\n", cameraName, formatsItem->name);
             continue;
@@ -540 +540 @@
         psMetadata *testFormat = NULL;  // Format to test against what we've got
         if (!pmConfigFileRead(&testFormat, formatsItem->data.V, formatsItem->name)) {
-            psLogMsg(__func__, PS_LOG_WARN, "Trouble reading reading camera format %s --- ignored.\n",
+            psLogMsg("psModules.config", PS_LOG_WARN, "Trouble reading reading camera format %s --- ignored.\n",
                      formatsItem->name);
             psFree(testFormat);
@@ -548 +548 @@
         if (pmConfigValidateCameraFormat(testFormat, header)) {
             if (!*format) {
-                psLogMsg(__func__, PS_LOG_INFO, "Camera %s, format %s matches header.\n", cameraName,
+                psLogMsg("psModules.config", PS_LOG_INFO, "Camera %s, format %s matches header.\n", cameraName,
                          formatsItem->name);
                 *format = psMemIncrRefCounter(testFormat);
                 result = true;
             } else {
-                psLogMsg(__func__, PS_LOG_WARN, "Camera %s, format %s also matches header --- ignored.\n",
+                psLogMsg("psModules.config", PS_LOG_WARN, "Camera %s, format %s also matches header --- ignored.\n",
                          cameraName, formatsItem->name);
+            }
+        } else {
+            if (psTraceGetLevel ("psModules.config") >= PS_LOG_INFO) {
+                psErrorStackPrint (stderr, "Camera %s, format %s does not match\n", cameraName, formatsItem->name);
             }
         }
@@ -589 +593 @@
                     camerasItem->comment);
             if (camerasItem->type != PS_DATA_STRING) {
-                psLogMsg(__func__, PS_LOG_WARN, "Camera configuration for %s in CAMERAS is not of type STR "
+                psLogMsg("psModules.config", PS_LOG_WARN, "Camera configuration for %s in CAMERAS is not of type STR "
                          "--- ignored.\n", camerasItem->name);
                 continue;
@@ -598 +602 @@
 
             if (!pmConfigFileRead(&testCamera, camerasItem->data.V, camerasItem->name)) {
-                psLogMsg(__func__, PS_LOG_WARN, "Trouble reading reading camera configuration %s --- "
+                psLogMsg("psModules.config", PS_LOG_WARN, "Trouble reading reading camera configuration %s --- "
                          "ignored.\n", camerasItem->name);
                 psFree(testCamera);
@@ -653 +657 @@
 
     if (!pmConfigFileRead(&camera, cameraPath, cameraName)) {
-        psLogMsg(__func__, PS_LOG_WARN, "Trouble reading reading camera configuration %s", cameraName);
+        psLogMsg("psModules.config", PS_LOG_WARN, "Trouble reading reading camera configuration %s", cameraName);
         psFree(camera);
         return NULL;
@@ -687 +691 @@
     }
     if (!(mdStatus01 && mdStatus02 && mdStatus03 && mdStatus04)) {
-        psLogMsg(__func__, PS_LOG_WARN,
+        psLogMsg("psModules.config", PS_LOG_WARN,
                  "Could not determine database server, name, user, and password from site metadata.\n");
         return NULL;