Merge lp:~mleith/mysql-proxy/bug55711 into lp:mysql-proxy

[Leith]

Bug#55711 - Agent log rotation : a HUP should rotate the log file
 - always close and re-open the log file before ignoring lower message levels

[Jan Kneschke (jan-kneschke)]

The 'is_duplicate' handling isn't updated with this change:

If you log "a", send a HUP, and log "a" again. The "a" should not be merged together, but logged as "a" into the old log and as "a" into the new one.

The change as it is in r1117 disables that behaviour and merges them all the time.

review: Needs Fixing

[Jan Kneschke (jan-kneschke)]

Looks good.

review: Approve

=== modified file 'src/chassis-log.c'
--- src/chassis-log.c	2010-06-30 14:43:13 +0000
+++ src/chassis-log.c	2010-08-10 12:52:44 +0000
@@ -279,12 +279,28 @@
 	int i;
 	gchar *log_lvl_name = "(error)";
 	gboolean is_duplicate = FALSE;
+	gboolean is_log_rotated = FALSE;
+	const char *stripped_message = chassis_log_skip_topsrcdir(message);
 
 	/**
 	 * make sure we syncronize the order of the write-statements 
 	 */
 	static GStaticMutex log_mutex = G_STATIC_MUTEX_INIT;
 
+	/**
+	 * rotate logs straight away if log->rotate_logs is true
+	 * we do this before ignoring any log levels, so that rotation 
+	 * happens straight away - see Bug#55711 
+	 */
+	if (-1 != log->log_file_fd) {
+		if (log->rotate_logs) {
+			chassis_log_close(log);
+			chassis_log_open(log);
+
+			is_log_rotated = TRUE; /* we will need to dump even duplicates */
+		}
+	}
+
 	/* ignore the verbose log-levels */
 	if (log_level > log->min_lvl) return;
 
@@ -298,24 +314,20 @@
 	}
 
 	if (log->last_msg->len > 0 &&
-	    0 == strcmp(log->last_msg->str, message)) {
+	    0 == strcmp(log->last_msg->str, stripped_message)) {
 		is_duplicate = TRUE;
 	}
 
-	if (-1 != log->log_file_fd) {
-		if (log->rotate_logs) {
-			chassis_log_close(log);
-			chassis_log_open(log);
-
-			is_duplicate = FALSE; /* after a log-rotation always dump the queue */
-		}
-	}
-
-
-	if (!is_duplicate ||
+	/**
+	 * if the log has been rotated, we always dump the last message even if it 
+	 * was a duplicate. Otherwise, do not print duplicates unless they have been
+	 * ignored at least 100 times, or they were last printed greater than 
+	 * 30 seconds ago.
+	 */
+	if (is_log_rotated ||
+	    !is_duplicate ||
 	    log->last_msg_count > 100 ||
 	    time(NULL) - log->last_msg_ts > 30) {
-		const char *stripped_message = chassis_log_skip_topsrcdir(message);
 
 		/* if we lave the last message repeating, log it */
 		if (log->last_msg_count) {
 
=== modified file 'src/chassis-mainloop.c'
--- src/chassis-mainloop.c	2010-04-06 17:29:58 +0000
+++ src/chassis-mainloop.c	2010-08-10 12:52:44 +0000
@@ -209,11 +209,11 @@
 static void sighup_handler(int G_GNUC_UNUSED fd, short G_GNUC_UNUSED event_type, void *_data) {
 	chassis *chas = _data;
 
-	g_message("received a SIGHUP, rotating logfile"); /* this should go into the old logfile */
+	g_message("received a SIGHUP, closing log file"); /* this should go into the old logfile */
 
 	chassis_log_set_logrotate(chas->log);
 	
-	g_message("rotated logfile"); /* ... and this into the new one */
+	g_message("re-opened log file after SIGHUP"); /* ... and this into the new one */
 }