X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Flog.c;h=0564dd3350859fb386420e6d3d2cd8238541667d;hb=4c431fe65269e9b1d452855b9df8cfe80683b691;hp=9392884f494d09db83f46c6721bde9b5e7c184e1;hpb=6014b0c3e4de295fb88dc71f779abe8bf7a5553b;p=umurmur.git

diff --git a/src/log.c b/src/log.c
index 9392884..0564dd3 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -34,26 +34,77 @@
 #include <stdlib.h>
 #include <syslog.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 #include "log.h"
+#include "conf.h"
 
 #define STRSIZE 254
 
-static bool_t termprint;
+static bool_t termprint, init;
+static FILE *logfile;
+
+static void openlogfile(const char *logfilename)
+{
+	int fd, flags;
+	logfile = fopen(logfilename, "a");
+	if (logfile == NULL) {
+		Log_fatal("Failed to open log file '%s' for writing: %s\n", logfilename, strerror(errno));
+	}
+
+	/* Set the stream as line buffered */
+	if (setvbuf(logfile, NULL, _IOLBF, 0) < 0)
+		Log_fatal("setvbuf() failed: %s\n", strerror(errno));
+	
+	/* XXX - Is it neccessary/appropriate that logging to file is non-blocking?
+	 * If not, there's a risk that execution blocks, meaning that voice blocks
+	 * as well since uMurmur is single threaded by design. OTOH, what could
+	 * cause a block? If the disk causes blocking, it is probably br0ken, but
+	 * the log could be on a nfs or smb share, so let's set it up as
+	 * non-blocking and we'll see what happens.
+	 */
+	fd = fileno(logfile);
+	flags = fcntl(fd, F_GETFL, 0);
+	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+}
 
 void Log_init(bool_t terminal)
 {
-	termprint = terminal;
-	if (!termprint)
-		openlog("uMurmurd", LOG_PID, LOG_DAEMON);
+	const char *logfilename;
+	
+	termprint = terminal;		
+	if (termprint)
+		return;
+	
+	logfilename = getStrConf(LOGFILE);
+	if (logfilename != NULL) {
+		openlogfile(logfilename);
+	}
+	else openlog("uMurmurd", LOG_PID, LOG_DAEMON);
+	init = true;
 }
 
 void Log_free()
 {
-	if (!termprint)
+	if (termprint)
+		return;
+	else if (logfile)
+		fclose(logfile);
+	else 
 		closelog();
 }
 		
+void Log_reset()
+{
+	const char *logfilename;
+	
+	if (logfile) {
+		logfilename = getStrConf(LOGFILE);
+		fclose(logfile);
+		openlogfile(logfilename);
+	}
+}
 
 void logthis(const char *logstring, ...)
 {
@@ -65,8 +116,10 @@ void logthis(const char *logstring, ...)
 	va_end(argp);
 	if (termprint)
 		fprintf(stderr, "%s\n", buf);
+	else if (logfile)
+		fprintf(logfile, "%s\n", buf);
 	else
-		syslog(LOG_INFO, buf);
+		syslog(LOG_INFO, "%s", buf);
 }
 
 void Log_warn(const char *logstring, ...)
@@ -81,8 +134,10 @@ void Log_warn(const char *logstring, ...)
 	va_end(argp);
 	if (termprint)
 		fprintf(stderr, "%s\n", buf);
+	else if (logfile)
+		fprintf(logfile, "%s\n", buf);
 	else
-		syslog(LOG_WARNING, buf);
+		syslog(LOG_WARNING, "%s", buf);
 }
 
 void Log_info(const char *logstring, ...)
@@ -97,9 +152,12 @@ void Log_info(const char *logstring, ...)
 	va_end(argp);
 	if (termprint)
 		fprintf(stderr, "%s\n", buf);
+	else if (logfile)
+		fprintf(logfile, "%s\n", buf);
 	else
-		syslog(LOG_INFO, buf);
+		syslog(LOG_INFO, "%s", buf);
 }
+
 void Log_info_client(client_t *client, const char *logstring, ...)
 {
 	va_list argp;
@@ -117,9 +175,10 @@ void Log_info_client(client_t *client, const char *logstring, ...)
 					   ntohs(client->remote_tcp.sin_port));
 	if (termprint)
 		fprintf(stderr, "%s\n", buf);
+	else if (logfile)
+		fprintf(logfile, "%s\n", buf);
 	else
-		syslog(LOG_INFO, buf);
-	
+		syslog(LOG_INFO, "%s", buf);
 }
 
 #ifdef DEBUG
@@ -135,8 +194,10 @@ void Log_debug(const char *logstring, ...)
 	va_end(argp);
 	if (termprint)
 		fprintf(stderr, "%s\n", buf);
+	else if (logfile)
+		fprintf(logfile, "%s\n", buf);
 	else
-		syslog(LOG_DEBUG, buf);
+		syslog(LOG_DEBUG, "%s", buf);
 }
 #endif
 
@@ -151,7 +212,17 @@ void Log_fatal(const char *logstring, ...)
 	va_end(argp);
 	if (termprint)
 		fprintf(stderr, "%s\n", buf);
-	else
-		syslog(LOG_CRIT, buf);
+	else if (logfile)
+		fprintf(logfile, "%s\n", buf);
+	else { /* If logging subsystem is not initialized, fall back to stderr +
+			* syslog logging for fatal errors. 
+			*/
+		if (!init) {
+			openlog("uMurmurd", LOG_PID, LOG_DAEMON);
+			fprintf(stderr, "%s\n", buf);
+		}
+		syslog(LOG_CRIT, "%s", buf);
+	}
+	
 	exit(1);
 }