ctdb-tests: Make fake_ctdbd use logging_init()
authorMartin Schwenke <martin@meltin.net>
Mon, 12 Dec 2016 05:43:43 +0000 (16:43 +1100)
committerAmitay Isaacs <amitay@samba.org>
Mon, 19 Dec 2016 03:07:07 +0000 (04:07 +0100)
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tests/src/fake_ctdbd.c

index d1f1f137fc4a864bf5abd0473e5be0220f514639..34114904d7d8d73357d5e03bcce6ca1381d8afc0 100644 (file)
@@ -3165,7 +3165,6 @@ int main(int argc, const char *argv[])
        TALLOC_CTX *mem_ctx;
        struct ctdbd_context *ctdb;
        struct tevent_context *ev;
-       int debug_level;
        poptContext pc;
        int opt, fd, ret, pfd[2];
        ssize_t len;
@@ -3191,24 +3190,19 @@ int main(int argc, const char *argv[])
                exit(1);
        }
 
-       if (options.debuglevel == NULL) {
-               DEBUGLEVEL = DEBUG_ERR;
-       } else {
-               if (debug_level_parse(options.debuglevel, &debug_level)) {
-                       DEBUGLEVEL = debug_level;
-               } else {
-                       fprintf(stderr, "Invalid debug level\n");
-                       poptPrintHelp(pc, stdout, 0);
-                       exit(1);
-               }
-       }
-
        mem_ctx = talloc_new(NULL);
        if (mem_ctx == NULL) {
                fprintf(stderr, "Memory error\n");
                exit(1);
        }
 
+       ret = logging_init(mem_ctx, "file:", options.debuglevel, "fake-ctdbd");
+       if (ret != 0) {
+               fprintf(stderr, "Invalid debug level\n");
+               poptPrintHelp(pc, stdout, 0);
+               exit(1);
+       }
+
        ctdb = ctdbd_setup(mem_ctx);
        if (ctdb == NULL) {
                exit(1);