X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=src%2Flogger.c;h=ecb55a534a631f7f3cf68b447b794cf97f3819d6;hb=7d0d06e82233623ce90c70dac2803a7f299c673e;hp=eb63089017ca39b9d4be3990653ecc68582d1e4b;hpb=3d5dd72aa41f162fd5d4d6dd13f46c0fca5a14a9;p=meshlink

diff --git a/src/logger.c b/src/logger.c
index eb630890..ecb55a53 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -20,12 +20,18 @@
 #include "system.h"
 
 #include "logger.h"
-
-debug_t debug_level = DEBUG_NOTHING;
-
-void logger(int level, int priority, const char *format, ...) {
-	if(level > debug_level)
-		return;
+#include "meshlink_internal.h"
+#include "sptps.h"
+
+// 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(struct sptps *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);
 }