X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flogger.c;h=f77252bd64e3a79731667f5bed193196029434f7;hb=76c7550c8ab0e9c0ee14a9c396baa008cfb9bc42;hp=ea29e3f69c3414e9d8b6278573bd2bc724cf614d;hpb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;p=meshlink

diff --git a/src/logger.c b/src/logger.c
index ea29e3f6..f77252bd 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -24,19 +24,27 @@
 #include "sptps.h"
 
 // TODO: refactor logging code to use a meshlink_handle_t *.
-void logger(int level, int priority, const char *format, ...) {
-	//if(level > mesh->debug_level)
-	//	return;
+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] = "";
 
 	va_start(ap, format);
-	int len = vsnprintf(message, sizeof message, format, ap);
+	int len = vsnprintf(message, sizeof(message), format, ap);
 	va_end(ap);
 
-	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+	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);
 }