/*
logger.c -- logging code
- Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+ Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#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, ...) {
+ assert(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 && (size_t)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);
+ }
}