X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flogger.c;h=bceccbc62f9cfbfe1a2a507115485d6ab666588f;hb=refs%2Fheads%2Fdirtydebug;hp=2b4c7e388ed007a0367969ae6578ba29295452fe;hpb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;p=meshlink

diff --git a/src/logger.c b/src/logger.c
index 2b4c7e38..bceccbc6 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -22,22 +22,17 @@
 
 #include "conf.h"
 #include "meta.h"
-#include "names.h"
 #include "logger.h"
 #include "connection.h"
-#include "control_common.h"
 #include "sptps.h"
 
 debug_t debug_level = DEBUG_NOTHING;
 static logmode_t logmode = LOGMODE_STDERR;
 static pid_t logpid;
-static FILE *logfile = NULL;
 #ifdef HAVE_MINGW
 static HANDLE loghandle = NULL;
 #endif
 static const char *logident = NULL;
-bool logcontrol = false;
-
 
 static void real_logger(int level, int priority, const char *message) {
 	char timestr[32] = "";
@@ -47,7 +42,7 @@ static void real_logger(int level, int priority, const char *message) {
 	if(suppress)
 		return;
 
-	if(!logcontrol && (level > debug_level || logmode == LOGMODE_NULL))
+	if(level > debug_level || logmode == LOGMODE_NULL)
 		return;
 
 	if(level <= debug_level) {
@@ -56,14 +51,6 @@ static void real_logger(int level, int priority, const char *message) {
 				fprintf(stderr, "%s\n", message);
 				fflush(stderr);
 				break;
-			case LOGMODE_FILE:
-				if(!now.tv_sec)
-					gettimeofday(&now, NULL);
-				time_t now_sec = now.tv_sec;
-				strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now_sec));
-				fprintf(logfile, "%s %s[%ld]: %s\n", timestr, logident, (long)logpid, message);
-				fflush(logfile);
-				break;
 			case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
 				{
@@ -80,22 +67,6 @@ static void real_logger(int level, int priority, const char *message) {
 				break;
 		}
 	}
-
-	if(logcontrol) {
-		suppress = true;
-		logcontrol = false;
-		for list_each(connection_t, c, connection_list) {
-			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;
-	}
 }
 
 void logger(int level, int priority, const char *format, ...) {
@@ -129,14 +100,6 @@ void openlogger(const char *ident, logmode_t 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);
@@ -161,26 +124,8 @@ void openlogger(const char *ident, logmode_t mode) {
 		sptps_log = sptps_log_quiet;
 }
 
-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;
-}
-
-
 void closelogger(void) {
 	switch(logmode) {
-		case LOGMODE_FILE:
-			fclose(logfile);
-			break;
 		case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
 			DeregisterEventSource(loghandle);