X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flogger.c;h=e6303c66b3eb644fd1a5fc37f1bf5bdea7b9bf06;hb=c59a97353703333eae2834e238bad2eb61e21d98;hp=bceccbc62f9cfbfe1a2a507115485d6ab666588f;hpb=1564f52f7643c554ec49a3e014bc9b9a8745c856;p=meshlink

diff --git a/src/logger.c b/src/logger.c
index bceccbc6..e6303c66 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,7 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2013 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
@@ -20,56 +19,14 @@
 
 #include "system.h"
 
-#include "conf.h"
-#include "meta.h"
 #include "logger.h"
-#include "connection.h"
+#include "meshlink_internal.h"
 #include "sptps.h"
 
-debug_t debug_level = DEBUG_NOTHING;
-static logmode_t logmode = LOGMODE_STDERR;
-static pid_t logpid;
-#ifdef HAVE_MINGW
-static HANDLE loghandle = NULL;
-#endif
-static const char *logident = NULL;
-
-static void real_logger(int level, int priority, const char *message) {
-	char timestr[32] = "";
-	static bool suppress = false;
-
-	// Bail out early if there is nothing to do.
-	if(suppress)
-		return;
-
-	if(level > debug_level || logmode == LOGMODE_NULL)
+void logger(int level, int priority, const char *format, ...) {
+	if(level > mesh->debug_level)
 		return;
 
-	if(level <= debug_level) {
-		switch(logmode) {
-			case LOGMODE_STDERR:
-				fprintf(stderr, "%s\n", message);
-				fflush(stderr);
-				break;
-			case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
-				{
-					const char *messages[] = {message};
-					ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
-				}
-#else
-#ifdef HAVE_SYSLOG_H
-				syslog(priority, "%s", message);
-#endif
-#endif
-				break;
-			case LOGMODE_NULL:
-				break;
-		}
-	}
-}
-
-void logger(int level, int priority, const char *format, ...) {
 	va_list ap;
 	char message[1024] = "";
 
@@ -80,65 +37,15 @@ void logger(int level, int priority, const char *format, ...) {
 	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
 		message[len - 1] = 0;
 
-	real_logger(level, priority, message);
+	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;
 
-	real_logger(DEBUG_ALWAYS, LOG_ERR, message);
-}
-
-void openlogger(const char *ident, logmode_t mode) {
-	logident = ident;
-	logmode = mode;
-
-	switch(mode) {
-		case LOGMODE_STDERR:
-			logpid = getpid();
-			break;
-		case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
-			loghandle = RegisterEventSource(NULL, logident);
-			if(!loghandle) {
-				fprintf(stderr, "Could not open log handle!");
-				logmode = LOGMODE_NULL;
-			}
-			break;
-#else
-#ifdef HAVE_SYSLOG_H
-			openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
-			break;
-#endif
-#endif
-		case LOGMODE_NULL:
-			break;
-	}
-
-	if(logmode != LOGMODE_NULL)
-		sptps_log = sptps_logger;
-	else
-		sptps_log = sptps_log_quiet;
-}
-
-void closelogger(void) {
-	switch(logmode) {
-		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;
-	}
+	fprintf(stderr, "%s\n", message);
 }