From 3f169f72aa84a5234293db5ff344beb9fdb47f6b Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sat, 5 Dec 2009 16:00:23 +0200
Subject: [PATCH] * mu-log: set the default handler, fixes logging

---
 src/mu-log.c | 51 ++++++++++++++++++++++++---------------------------
 src/mu-log.h | 23 ++++++++++++-----------
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/src/mu-log.c b/src/mu-log.c
index e79ae1cf..1ee5e605 100644
--- a/src/mu-log.c
+++ b/src/mu-log.c
@@ -30,11 +30,14 @@
 
 #include "mu-log.h"
 
+#define MU_LOG_FILE "mu.log"
+
 struct _MuLog {
 	int _fd;      /* log file descriptor */
 	int _own;     /* close _fd with log_destroy? */
-	int _log_id;  /* log handler id */
 	int _debug;   /* add debug-level stuff? */
+
+	GLogFunc _old_log_func;
 };
 typedef struct _MuLog MuLog;
 
@@ -67,12 +70,8 @@ mu_log_init_silence (void)
         MU_LOG->_fd     = -1;
 	MU_LOG->_own    = FALSE; /* nobody owns silence */
 	
-	MU_LOG->_log_id =
-		g_log_set_handler (NULL,
-				   G_LOG_LEVEL_DEBUG|
-				   G_LOG_LEVEL_MESSAGE|
-				   G_LOG_LEVEL_INFO,
-				   (GLogFunc)silence, NULL);
+	MU_LOG->_old_log_func =
+		g_log_set_default_handler ((GLogFunc)silence, NULL);
 	return TRUE;
 }
 
@@ -99,34 +98,32 @@ mu_log_init_with_fd (int fd, gboolean doclose, gboolean debug)
 	MU_LOG->_debug  = debug;
         MU_LOG->_own    = doclose; /* if we now own the fd, close it
 				    * in _destroy */
-	
-	g_log_set_handler ("mu", G_LOG_LEVEL_MASK,
-			   (GLogFunc)log_handler, NULL);
+	MU_LOG->_old_log_func =
+		g_log_set_default_handler ((GLogFunc)log_handler, NULL);
 	
 	return TRUE;
 }
 
 gboolean
-mu_log_init_with_file  (const char* file, gboolean append, gboolean debug)
+mu_log_init  (const char* muhome, gboolean append, gboolean debug)
 {
 	int fd;
+	gchar *logfile;
 	
 	/* only init once... */
-	g_return_val_if_fail (!MU_LOG, FALSE);
+	g_return_val_if_fail (!MU_LOG, FALSE);	
+	g_return_val_if_fail (muhome, FALSE);
 	
-	fd = -1;	
-	if (file) {
-		fd = open (file,
-			   O_WRONLY|O_CREAT|(append ? O_APPEND : O_TRUNC),
-			   00600);
-		if (fd < 0) {
-			fprintf (stderr, "%s: open() of '%s' failed: %s\n",
-				 __FUNCTION__, file, strerror(errno));
-			return FALSE;
-		}
-	}
-			   
-	if (!mu_log_init_with_fd (fd, FALSE, debug)) {
+	logfile = g_strdup_printf ("%s%c%s", muhome,
+				   G_DIR_SEPARATOR, MU_LOG_FILE);
+	fd = open (logfile,  O_WRONLY|O_CREAT|(append ? O_APPEND : O_TRUNC),
+		   00600);
+	if (fd < 0) 
+		g_warning ("%s: open() of '%s' failed: %s\n",  __FUNCTION__,
+			   logfile, strerror(errno));
+	g_free (logfile);
+	
+	if (fd < 0 || !mu_log_init_with_fd (fd, FALSE, debug)) {
 		try_close (fd);
 		return FALSE;
 	}
@@ -178,8 +175,8 @@ log_write (const char* domain, GLogLevelFlags level,
 	strftime (timebuf, sizeof(timebuf), "%F %T", localtime(&now));
 		
 	/* now put it all together */
-	len = snprintf (buf, sizeof(buf), "%s [%s] [%s] %s\n", timebuf, 
-			pfx(level), domain, msg);
+	len = snprintf (buf, sizeof(buf), "%s [%s] %s\n", timebuf, 
+			pfx(level), msg);
 	
 	len = write (MU_LOG->_fd, buf, len);
 	if (len < 0)
diff --git a/src/mu-log.h b/src/mu-log.h
index cca1fb82..64e69dac 100644
--- a/src/mu-log.h
+++ b/src/mu-log.h
@@ -24,6 +24,18 @@
 
 /* mu log is the global logging system */
 
+/** 
+ * write logging information to a log file
+ * 
+ * @param muhome the mu home directory
+ * @param append append to logfile, instead of overwriting
+ * @param debug include debug-level information.
+ * 
+ * @return TRUE if initialization succeeds, FALSE otherwise
+ */
+gboolean mu_log_init  (const char* muhome, gboolean append,
+		       gboolean debug);
+
 /** 
  * write logging information to a file descriptor
  * 
@@ -36,17 +48,6 @@
 gboolean mu_log_init_with_fd    (int fd, gboolean doclose, gboolean debug);
 
 
-/** 
- * write logging information to a file descriptor
- * 
- * @param a filename to log to
- * @param append append to logfile, instead of overwriting
- * @param debug include debug-level information.
- * 
- * @return TRUE if initialization succeeds, FALSE otherwise
- */
-gboolean mu_log_init_with_file  (const char* file, gboolean append,
-				 gboolean debug);
 
 /** 
  * be absolutely silent, except for runtime errors, which will be