X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flogger.c;h=5f3bbbbfedb04c9b41ae08acb2e31ceee0c19d3d;hb=a1b50920b9a52f86ca6e33fcb24d7fa34313a1ee;hp=cc47a4a1cbfdedeb05e30b29e9a6dcc5d1cd2ee5;hpb=268c8545aaf83b7433f43402f5c77e39e20006ef;p=meshlink

diff --git a/src/logger.c b/src/logger.c
index cc47a4a1..5f3bbbbf 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,7 +1,6 @@
 /*
     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
@@ -20,155 +19,34 @@
 
 #include "system.h"
 
-#include "conf.h"
-#include "meta.h"
 #include "logger.h"
-#include "connection.h"
-#include "control_common.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;
-bool logcontrol = false;
-
-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) {
-				fprintf(stderr, "Could not open log file %s: %s\n", logfilename, strerror(errno));
-				logmode = LOGMODE_NULL;
-			}
-			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;
-	}
-}
-
-void reopenlogger() {
-	if(logmode != LOGMODE_FILE)
-		return;
-
-	fflush(logfile);
-	FILE *newfile = fopen(logfilename, "a");
-	if(!newfile) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reopen log file %s: %s", logfilename, strerror(errno));
-		return;
-	}
-	fclose(logfile);
-	logfile = newfile;
-}
+#include "meshlink_internal.h"
+#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;
+
 	va_list ap;
-	char timestr[32] = "";
 	char message[1024] = "";
-	time_t now;
-	static bool suppress = false;
-
-	// Bail out early if there is nothing to do.
-	if(suppress)
-		return;
-
-	if(!logcontrol && (level > debug_level || logmode == LOGMODE_NULL))
-		return;
 
 	va_start(ap, format);
-	vsnprintf(message, sizeof message, format, ap);
+	int len = vsnprintf(message, sizeof message, format, ap);
 	va_end(ap);
 
-	if(level <= debug_level) {
-		switch(logmode) {
-			case LOGMODE_STDERR:
-				fprintf(stderr, "%s\n", message);
-				fflush(stderr);
-				break;
-			case LOGMODE_FILE:
-				now = time(NULL);
-				strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now));
-				fprintf(logfile, "%s %s[%ld]: %s\n", timestr, logident, (long)logpid, message);
-				fflush(logfile);
-				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;
-		}
-	}
+	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+		message[len - 1] = 0;
 
-	if(logcontrol) {
-		suppress = true;
-		logcontrol = false;
-		for(splay_node_t *node = connection_tree->head; node; node = node->next) {
-			connection_t *c = node->data;
-			if(!c->status.log)
-				continue;
-			logcontrol = true;
-			if(level > (c->outcompression >= 0 ? c->outcompression : debug_level))
-				continue;
-			int len = strlen(message);
-			if(send_request(c, "%d %d %d", CONTROL, REQ_LOG, len))
-				send_meta(c, message, len);
-		}
-		suppress = false;
-	}
+	fprintf(stderr, "%s\n", message);
 }
 
-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;
-	}
+// 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);
 }