Changeset 10065

Timestamp:

Nov 17, 2006, 4:14:18 PM (20 years ago)

Author:

Paul Price

Message:

psArgumentVerbosity was clobbering the pre-set log level.

File:

• trunk/psLib/src/types/psArguments.c (modified) (3 diffs)

trunk/psLib/src/types/psArguments.c

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 21:13:48 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-18 02:14:18 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
                         char **argv)
 {
-    int logLevel = 2;   // Default log level
-    psLogSetLevel(logLevel);
+    int logLevel = psLogGetLevel();     // Current logging level
     PS_ASSERT_PTR_NON_NULL(argv, 2);
     PS_ASSERT_PTR_NON_NULL(argc, 2);
@@ -44 +43 @@
         psArgumentRemove(argnum, argc, argv);
         logLevel = 3;
+        psLogSetLevel(logLevel);
     }
     if ( (argnum = psArgumentGet(*argc, argv, "-vv")) ) {
         psArgumentRemove(argnum, argc, argv);
         logLevel = 4;
+        psLogSetLevel(logLevel);
     }
     if ( (argnum = psArgumentGet(*argc, argv, "-vvv")) ) {
         psArgumentRemove(argnum, argc, argv);
         logLevel = 5;
-    }
-    psLogSetLevel(logLevel);  // XXX: This function should return an error if the log level is invalid
+        psLogSetLevel(logLevel);
+    }
 
     if ( (argnum = psArgumentGet(*argc, argv, "-logfmt")) ) {