Merge branch 'discovery' of chicago.everbase.net:meshlink/meshlink into everbase

[meshlink] / src / logger.c

diff --git a/src/logger.c b/src/logger.c
index e6303c66b3eb644fd1a5fc37f1bf5bdea7b9bf06..ecb55a534a631f7f3cf68b447b794cf97f3819d6 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -23,9 +23,15 @@
 #include "meshlink_internal.h"
 #include "sptps.h"
 
-void logger(int level, int priority, const char *format, ...) {
-       if(level > mesh->debug_level)
-               return;
+// TODO: refactor logging code to use a meshlink_handle_t *.
+void logger(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *format, ...) {
+       if(mesh) {
+               if(level < mesh->log_level || !mesh->log_cb)
+                       return;
+       } else {
+               if(level < global_log_level || !global_log_cb)
+                       return;
+       }
 
        va_list ap;
        char message[1024] = "";
@@ -37,15 +43,8 @@ void logger(int level, int priority, const char *format, ...) {
        if(len > 0 && len < sizeof message && message[len - 1] == '\n')
                message[len - 1] = 0;
 
-       fprintf(stderr, "%s\n", message);
-}
-
-// TODO: make sure this gets used somewhere
-static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
-       char message[1024] = "";
-       int len = vsnprintf(message, sizeof message, format, ap);
-       if(len > 0 && len < sizeof message && message[len - 1] == '\n')
-               message[len - 1] = 0;
-
-       fprintf(stderr, "%s\n", message);
+       if(mesh)
+               mesh->log_cb(mesh, level, message);
+       else
+               global_log_cb(NULL, level, message);
 }