ctdb-logging: Allow numeric specification of debug level

This makes the function compatible with parse_debug().

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/common/logging.c b/ctdb/common/logging.c
index cc8e5b2c04bc1456f17de908d65d7133264cb98c..f2304715c8d7776ef3728a010bfd956dd87a8605 100644 (file)
--- a/ctdb/common/logging.c
+++ b/ctdb/common/logging.c
@@ -18,6 +18,7 @@
 */
 
 #include <replace.h>
+#include <system/locale.h>
 
 #include "common/logging.h"
 
@@ -36,6 +37,16 @@ bool debug_level_parse(const char *log_string, enum debug_level *log_level)
 {
        int i;
 
+       if (isdigit(log_string[0])) {
+               int level = atoi(log_string);
+
+               if (level >= 0 && level < ARRAY_SIZE(log_string_map)) {
+                       *log_level = debug_level_from_int(level);
+                       return true;
+               }
+               return false;
+       }
+
        for (i=0; i<ARRAY_SIZE(log_string_map); i++) {
                if (strncasecmp(log_string_map[i].log_string,
                                log_string, strlen(log_string)) == 0) {