/*
logger.c -- logging code
- Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
- 2004-2005 Ivo Timmermans
+ Copyright (C) 2014 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 "system.h"
-#include "conf.h"
#include "logger.h"
-
-debug_t debug_level = DEBUG_NOTHING;
-static logmode_t logmode = LOGMODE_STDERR;
-static pid_t logpid;
-extern char *logfilename;
-static FILE *logfile = NULL;
-#ifdef HAVE_MINGW
-static HANDLE loghandle = NULL;
-#endif
-static const char *logident = NULL;
-
-void openlogger(const char *ident, logmode_t mode) {
- logident = ident;
- logmode = mode;
-
- switch(mode) {
- case LOGMODE_STDERR:
- logpid = getpid();
- break;
- case LOGMODE_FILE:
- logpid = getpid();
- logfile = fopen(logfilename, "a");
- if(!logfile)
- logmode = LOGMODE_NULL;
- break;
- case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
- loghandle = RegisterEventSource(NULL, logident);
- if(!loghandle)
- logmode = LOGMODE_NULL;
- break;
-#else
-#ifdef HAVE_SYSLOG_H
- openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
- break;
-#endif
-#endif
- case LOGMODE_NULL:
- break;
+#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;
}
-}
-void logger(int priority, const char *format, ...) {
va_list ap;
+ char message[1024] = "";
va_start(ap, format);
-
- switch(logmode) {
- case LOGMODE_STDERR:
- vfprintf(stderr, format, ap);
- fprintf(stderr, "\n");
- fflush(stderr);
- break;
- case LOGMODE_FILE:
- fprintf(logfile, "%ld %s[%ld]: ", time(NULL), logident, (long)logpid);
- vfprintf(logfile, format, ap);
- fprintf(logfile, "\n");
- fflush(logfile);
- break;
- case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
- {
- char message[4096];
- char *messages[] = {message};
- vsnprintf(message, sizeof message, format, ap);
- ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
- }
-#else
-#ifdef HAVE_SYSLOG_H
-#ifdef HAVE_VSYSLOG
- vsyslog(priority, format, ap);
-#else
- {
- char message[4096];
- vsnprintf(message, sizeof message, format, ap);
- syslog(priority, "%s", message);
- }
-#endif
- break;
-#endif
-#endif
- case LOGMODE_NULL:
- break;
- }
-
+ int len = vsnprintf(message, sizeof message, format, ap);
va_end(ap);
-}
-void closelogger(void) {
- switch(logmode) {
- case LOGMODE_FILE:
- fclose(logfile);
- break;
- case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
- DeregisterEventSource(loghandle);
- break;
-#else
-#ifdef HAVE_SYSLOG_H
- closelog();
- break;
-#endif
-#endif
- case LOGMODE_NULL:
- case LOGMODE_STDERR:
- break;
- break;
- }
+ if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+ message[len - 1] = 0;
+
+ if(mesh)
+ mesh->log_cb(mesh, level, message);
+ else
+ global_log_cb(NULL, level, message);
}