From cf07a9fc4fbcd9869ee6df339ece53596a54d873 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Mon, 5 Jun 2017 14:50:33 +1200
Subject: Logging improvements

---
 common/log.c | 66 ++++++++++++------------------------------------------------
 1 file changed, 13 insertions(+), 53 deletions(-)

(limited to 'common')

diff --git a/common/log.c b/common/log.c
index 7e59fcca..af07334a 100644
--- a/common/log.c
+++ b/common/log.c
@@ -10,7 +10,7 @@
 #include "common/log.h"
 
 static bool colored = true;
-static log_callback_t log_callback;
+static log_callback_t log_callback = wlr_log_stderr;
 
 static const char *verbosity_colors[] = {
 	[L_SILENT] = "",
@@ -21,46 +21,26 @@ static const char *verbosity_colors[] = {
 
 void wlr_log_init(log_callback_t callback) {
 	log_callback = callback;
-	// TODO: Use log callback
 }
 
-void _wlr_vlog(const char *filename, int line, log_importance_t verbosity,
-		const char *format, va_list args) {
+void wlr_log_stderr(log_importance_t verbosity, const char *fmt, va_list args) {
 	// prefix the time to the log message
-	static struct tm result;
-	static time_t t;
-	static struct tm *tm_info;
+	struct tm result;
+	time_t t = time(NULL);
+	struct tm *tm_info = localtime_r(&t, &result);
 	char buffer[26];
 
-	// get current time
-	t = time(NULL);
-	// convert time to local time (determined by the locale)
-	tm_info = localtime_r(&t, &result);
 	// generate time prefix
-	strftime(buffer, sizeof(buffer), "%x %X - ", tm_info);
+	strftime(buffer, sizeof(buffer), "%F %T - ", tm_info);
 	fprintf(stderr, "%s", buffer);
 
-	unsigned int c = verbosity;
-	if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
-		c = sizeof(verbosity_colors) / sizeof(char *) - 1;
-	}
+	unsigned c = (verbosity < L_LAST) ? verbosity : L_LAST - 1;
 
 	if (colored && isatty(STDERR_FILENO)) {
 		fprintf(stderr, "%s", verbosity_colors[c]);
 	}
 
-	if (filename && line) {
-		const char *file = filename + strlen(filename);
-		while (file != filename && *file != '/') {
-			--file;
-		}
-		if (*file == '/') {
-			++file;
-		}
-		fprintf(stderr, "[%s:%d] ", file, line);
-	}
-
-	vfprintf(stderr, format, args);
+	vfprintf(stderr, fmt, args);
 
 	if (colored && isatty(STDERR_FILENO)) {
 		fprintf(stderr, "\x1B[0m");
@@ -68,33 +48,13 @@ void _wlr_vlog(const char *filename, int line, log_importance_t verbosity,
 	fprintf(stderr, "\n");
 }
 
-void _wlr_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) {
-	va_list args;
-	va_start(args, format);
-	_wlr_vlog(filename, line, verbosity, format, args);
-	va_end(args);
+void _wlr_vlog(log_importance_t verbosity, const char *fmt, va_list args) {
+	log_callback(verbosity, fmt, args);
 }
 
-void wlr_log_errno(log_importance_t verbosity, char* format, ...) {
-	unsigned int c = verbosity;
-	if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
-		c = sizeof(verbosity_colors) / sizeof(char *) - 1;
-	}
-
-	if (isatty(STDERR_FILENO)) {
-		fprintf(stderr, "%s", verbosity_colors[c]);
-	}
-
+void _wlr_log(log_importance_t verbosity, const char *fmt, ...) {
 	va_list args;
-	va_start(args, format);
-	vfprintf(stderr, format, args);
+	va_start(args, fmt);
+	log_callback(verbosity, fmt, args);
 	va_end(args);
-
-	fprintf(stderr, ": ");
-	fprintf(stderr, "%s", strerror(errno));
-
-	if (isatty(STDERR_FILENO)) {
-		fprintf(stderr, "\x1B[0m");
-	}
-	fprintf(stderr, "\n");
 }
-- 
cgit v1.2.3