[Gnucash-changes] r13027 - gnucash/trunk - reverting r12999 and implementing a set of default log modules

[Neil Williams]

Author: codehelp
Date: 2006-01-29 12:49:35 -0500 (Sun, 29 Jan 2006)
New Revision: 13027
Trac: http://svn.gnucash.org/trac/changeset/13027

Modified:
   gnucash/trunk/lib/libqof/qof/qoflog.c
   gnucash/trunk/src/bin/gnucash-bin.c
   gnucash/trunk/src/engine/gnc-engine.c
   gnucash/trunk/src/engine/gnc-engine.h
Log:
reverting r12999 and implementing a set of default log modules

Modified: gnucash/trunk/lib/libqof/qof/qoflog.c
===================================================================
--- gnucash/trunk/lib/libqof/qof/qoflog.c	2006-01-29 17:24:46 UTC (rev 13026)
+++ gnucash/trunk/lib/libqof/qof/qoflog.c	2006-01-29 17:49:35 UTC (rev 13027)
@@ -48,7 +48,6 @@
 static const int MAX_TRACE_FILENAME = 100;
 static GHashTable *log_table = NULL;
 static gint qof_log_num_spaces = 0;
-static QofLogLevel global_default_loglevel = 0;
 
 /* uses the enum_as_string macro.
 Lookups are done on the string. */
@@ -136,7 +135,6 @@
 	gchar* level_string;
 
 	if(!log_table || level == 0) { return; }
-	global_default_loglevel = level;
 	level_string = g_strdup(QofLogLevelasString(level));
 	g_hash_table_foreach(log_table, log_module_foreach, level_string);
 }
@@ -312,11 +310,9 @@
 	log_string = NULL;
 	if(!log_table || log_module == NULL || log_level == 0) { return FALSE; }
 	log_string = (gchar*)g_hash_table_lookup(log_table, log_module);
-	/* if log_module not found, use default. */
-	if (log_string) 
-	    maximum = QofLogLevelfromString(log_string);
-	else
-	    maximum = global_default_loglevel;
+	/* if log_module not found, do not log. */
+	if(!log_string) { return FALSE; }
+	maximum = QofLogLevelfromString(log_string);
 	if(log_level <= maximum) { return TRUE; }
 	return FALSE;
 }

Modified: gnucash/trunk/src/bin/gnucash-bin.c
===================================================================
--- gnucash/trunk/src/bin/gnucash-bin.c	2006-01-29 17:24:46 UTC (rev 13026)
+++ gnucash/trunk/src/bin/gnucash-bin.c	2006-01-29 17:49:35 UTC (rev 13027)
@@ -374,6 +374,8 @@
        before booting guile.  */
     gnc_main_gui_init();
 
+    /* set a log level before trying to change it globally */
+    gnc_log_default();
     qof_log_set_level_global(loglevel);
 
     load_system_config();

Modified: gnucash/trunk/src/engine/gnc-engine.c
===================================================================
--- gnucash/trunk/src/engine/gnc-engine.c	2006-01-29 17:24:46 UTC (rev 13026)
+++ gnucash/trunk/src/engine/gnc-engine.c	2006-01-29 17:49:35 UTC (rev 13027)
@@ -147,6 +147,38 @@
 	return (engine_is_initialized == 1) ? TRUE : FALSE;
 }
 
+/* replicate old gnc-trace enum behaviour
+ *
+ * these are only here as a convenience, they could be
+ * initialised elsewhere as appropriate.
+ * */
+void gnc_log_default(void)
+{
+	qof_log_set_default(QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_ENGINE, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_ACCOUNT, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_SX, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_QUERY, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_SCRUB, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_LOT, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_COMMODITY, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_BACKEND, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_PRICE, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_BUSINESS, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_IO, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_BOOK, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_GUI, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_GUILE, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_LEDGER, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_REGISTER, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_HTML, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_PREFS, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_IMPORT, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_DRUID, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_TEST, QOF_LOG_DETAIL);
+	qof_log_set_level(GNC_MOD_BUDGET, QOF_LOG_DETAIL);
+}
+
 /* ====================================================================== */
 /* XXX This exports the list of accounts to a file.  It does not export
  * any transactions.  Its a place-holder until full book-closing is implemented.

Modified: gnucash/trunk/src/engine/gnc-engine.h
===================================================================
--- gnucash/trunk/src/engine/gnc-engine.h	2006-01-29 17:24:46 UTC (rev 13026)
+++ gnucash/trunk/src/engine/gnc-engine.h	2006-01-29 17:49:35 UTC (rev 13027)
@@ -241,6 +241,9 @@
 /** check the engine is fully initialized */
 gboolean gnc_engine_is_initialized(void);
 
+/** enable default log modules */
+void gnc_log_default(void);
+
 /** Pass a function pointer to gnc_engine_add_init_hook and 
  * it will be called during the evaluation of gnc_engine_init */
 void gnc_engine_add_init_hook(gnc_engine_init_hook_t hook);