]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Cleanup VIR_LOG_DEBUG parsing in eventtest
authorAmy Griffis <amy.griffis@hp.com>
Thu, 6 Aug 2009 13:50:40 +0000 (15:50 +0200)
committerDaniel Veillard <veillard@redhat.com>
Thu, 6 Aug 2009 13:50:40 +0000 (15:50 +0200)
* tests/eventtest.c: don't covert high priority levels to debug level.
  Consider an invalid priority level setting a setup failure.

tests/eventtest.c

index ff74b043e9fa3424c61727482ce60f43b59e9f67..05fe3f3a57b096eabcde540c3d44bd22fc743c2c 100644 (file)
@@ -272,15 +272,19 @@ mymain(int argc, char **argv)
     if (virThreadInitialize() < 0)
         return EXIT_FAILURE;
     char *debugEnv = getenv("LIBVIRT_DEBUG");
-    if (debugEnv && *debugEnv && *debugEnv != '0') {
-        if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info"))
+    if (debugEnv && *debugEnv) {
+        if (STREQ(debugEnv, "1") || STREQ(debugEnv, "debug"))
+            virLogSetDefaultPriority(VIR_LOG_DEBUG);
+        else if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info"))
             virLogSetDefaultPriority(VIR_LOG_INFO);
         else if (STREQ(debugEnv, "3") || STREQ(debugEnv, "warning"))
             virLogSetDefaultPriority(VIR_LOG_WARN);
         else if (STREQ(debugEnv, "4") || STREQ(debugEnv, "error"))
             virLogSetDefaultPriority(VIR_LOG_ERROR);
-        else
-            virLogSetDefaultPriority(VIR_LOG_DEBUG);
+        else {
+            fprintf(stderr, "Invalid log level setting.\n");
+            return EXIT_FAILURE;
+        }
     }
 
     virEventInit();