Stop using the global variable mesh in most of the rest of the code.

[meshlink] / src / logger.c

diff --git a/src/logger.c b/src/logger.c
index a1cc2073c0015760fe6879648ca16f85b2a92a26..5f3bbbbfedb04c9b41ae08acb2e31ceee0c19d3d 100644 (file)
--- 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,114 +19,34 @@
 
 #include "system.h"
 
-#include "conf.h"
 #include "logger.h"
+#include "meshlink_internal.h"
+#include "sptps.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;
+// 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 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;
-       }
-}
-
-void logger(int priority, const char *format, ...) {
        va_list ap;
+       char message[1024] = "";
 
        va_start(ap, format);
+       int len = vsnprintf(message, sizeof message, format, ap);
+       va_end(ap);
 
-       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;
-       }
+       if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+               message[len - 1] = 0;
 
-       va_end(ap);
+       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);
 }