From 6c7d8a1165b6bcd0a4508262eac1d42bca77ef7a Mon Sep 17 00:00:00 2001
From: Thomas Porzelt <tp@cryosphere.de>
Date: Sat, 19 Jul 2008 15:12:32 +0200
Subject: [PATCH] log fixes

---
 src/lighttpd.c |  8 ++++++++
 src/log.c      | 36 ++++++++++++++++++++++--------------
 src/log.h      |  1 +
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/lighttpd.c b/src/lighttpd.c
index 5dc4afa..0edc024 100644
--- a/src/lighttpd.c
+++ b/src/lighttpd.c
@@ -69,6 +69,14 @@ int main(int argc, char *argv[]) {
 
 	TRACE("%s", "Test!");
 
+	log_write_(srv, NULL, LOG_LEVEL_WARNING, "test %s", "foo1");
+	log_write_(srv, NULL, LOG_LEVEL_WARNING, "test %s", "foo1");
+	log_write_(srv, NULL, LOG_LEVEL_WARNING, "test %s", "foo2");
+	log_debug(srv, NULL, "test %s", "message");
+	sleep(3);
+	log_error(srv, NULL, "error %d", 23);
+	log_write_(srv, NULL, LOG_LEVEL_WARNING, "test %s", "foo3");
+
 	g_thread_join(srv->log_thread);
 
 	return 0;
diff --git a/src/log.c b/src/log.c
index fd14c8a..656b47d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -51,12 +51,12 @@ gboolean log_write_(server *srv, connection *con, log_level_t log_level, const g
 	}
 
 	/* ingore messages we are not interested in */
-	if (log_level_want < log_level)
+	if (log_level < log_level_want)
 		return TRUE;
 
 	/* get fd from server */
 	g_mutex_lock(srv->mutex);
-	log = &g_array_index(srv->logs, log_t, log_ndx);
+	log = g_array_index(srv->logs, log_t *, log_ndx);
 	g_mutex_unlock(srv->mutex);
 
 	log_line = g_string_sized_new(0);
@@ -65,18 +65,22 @@ gboolean log_write_(server *srv, connection *con, log_level_t log_level, const g
 	va_end(ap);
 
 	/* check if last message for this log was the same */
-	if (g_string_equal(log->lastmsg, log_line)) {
+	if (log->fd == log->lastmsg_fd && g_string_equal(log->lastmsg, log_line)) {
 		log->lastmsg_count++;
 		return TRUE;
 	}
 	else {
 		if (log->lastmsg_count > 0) {
-			log_write_(srv, con, log_level, "last message repeated %d times", log->lastmsg_count);
+			guint count = log->lastmsg_count;
+			log->lastmsg_count = 0;
+			log_write_(srv, con, log_level, "last message repeated %d times", count);
 		}
-
-		log->lastmsg_count = 0;
 	}
 
+
+	g_string_assign(log->lastmsg, log_line->str);
+	log->lastmsg_fd = log->fd;
+
 	g_string_append_len(log_line, CONST_STR_LEN("\r\n"));
 
 
@@ -136,11 +140,12 @@ gpointer log_thread(server *srv) {
 		g_time_val_add(timeout, 1000 * 1000 * 1);
 		log_entry = g_async_queue_timed_pop(srv->log_queue, timeout);
 
-		g_print("log_thread ping\n");
 
 		if (log_entry == NULL)
 			continue;
 
+		bytes_written = 0;
+
 		while (bytes_written < (gssize)log_entry->msg->len) {
 			write_res = write(log_entry->fd, log_entry->msg->str + bytes_written, log_entry->msg->len - bytes_written);
 
@@ -153,6 +158,8 @@ gpointer log_thread(server *srv) {
 					case EINTR:
 						continue;
 				}
+
+				g_printerr("could not write to log: %s\n", log_entry->msg->str);
 			}
 			else {
 				bytes_written += write_res;
@@ -171,19 +178,20 @@ void log_init(server *srv) {
 	log_t *log;
 	GError *err = NULL;
 
+	/* first entry in srv->logs is the plain good old stderr */
+	log = g_slice_new(log_t);
+	log->fd = STDERR_FILENO;
+	log->lastmsg = g_string_sized_new(0);
+	log->lastmsg_count = 0;
+	log->lastmsg_fd = -1;
+	g_array_append_val(srv->logs, log);
+
 	srv->log_thread = g_thread_create((GThreadFunc)log_thread, srv, TRUE, &err);
 
 	if (srv->log_thread == NULL) {
 		g_printerr("could not create loggin thread: %s\n", err->message);
 		assert(NULL);
 	}
-
-
-	/* first entry in srv->logs is the plain good old stderr */
-	log = g_slice_new0(log_t);
-	log->fd = STDERR_FILENO;
-	log->lastmsg = g_string_sized_new(0);
-	g_array_append_val(srv->logs, log);
 }
 
 
diff --git a/src/log.h b/src/log.h
index a106555..f7b4bd6 100644
--- a/src/log.h
+++ b/src/log.h
@@ -83,6 +83,7 @@ typedef enum {
 struct log_t {
 	gint fd;
 	GString *lastmsg;
+	gint lastmsg_fd;
 	guint lastmsg_count;
 };