beagle r4890 - in trunk/beagle: BeagleClient Filters Util beagled beagled/FileSystemQueryable beagled/ThunderbirdQueryable

[dbera svn gnome org]

Author: dbera
Date: Sun Dec 21 01:38:34 2008
New Revision: 4890
URL: http://svn.gnome.org/viewvc/beagle?rev=4890&view=rev

Log:
Replace all the hardcoded Debug=true/false by a user supplied BEAGLE_DEBUG environment variable. User can set this variable to a comma-separated list of names and the internal debug for those classnames will be turned on.
* The user still needs to know which value to use for the env var - so its still meant for debugging only.
* However, now any user can turn on class specific debugging by just setting the env var - this should make debugging easier.


Modified:
   trunk/beagle/BeagleClient/Indexable.cs
   trunk/beagle/Filters/FilterGif.cs
   trunk/beagle/Filters/FilterTotem.cs
   trunk/beagle/Util/Makefile.am
   trunk/beagle/Util/Scheduler.cs
   trunk/beagle/Util/TopScores.cs
   trunk/beagle/Util/XmlFu.cs
   trunk/beagle/beagled/FileAttributesStore.cs
   trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs
   trunk/beagle/beagled/Filter.cs
   trunk/beagle/beagled/FilterFactory.cs
   trunk/beagle/beagled/LuceneBitArray.cs
   trunk/beagle/beagled/LuceneQueryingDriver.cs
   trunk/beagle/beagled/QueryResult.cs
   trunk/beagle/beagled/Shutdown.cs
   trunk/beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs

Modified: trunk/beagle/BeagleClient/Indexable.cs
==============================================================================
--- trunk/beagle/BeagleClient/Indexable.cs	(original)
+++ trunk/beagle/BeagleClient/Indexable.cs	Sun Dec 21 01:38:34 2008
@@ -53,7 +53,7 @@
 
 	public class Indexable : Versioned, IComparable {
 
-		static private bool Debug = false;
+		static private bool Debug = Beagle.Util.Debug.Enabled ("Indexable");
 
 		// This is the type of indexing operation represented by
 		// this Indexable object.  We default to Add, for historical

Modified: trunk/beagle/Filters/FilterGif.cs
==============================================================================
--- trunk/beagle/Filters/FilterGif.cs	(original)
+++ trunk/beagle/Filters/FilterGif.cs	Sun Dec 21 01:38:34 2008
@@ -49,7 +49,7 @@
 			ApplicationExtension = 0xff
 		}
 
-		static public bool Debug = false;
+		static public bool Debug = Beagle.Util.Debug.Enabled ("FilterGif");
 
 		public FilterGif ()
 		{

Modified: trunk/beagle/Filters/FilterTotem.cs
==============================================================================
--- trunk/beagle/Filters/FilterTotem.cs	(original)
+++ trunk/beagle/Filters/FilterTotem.cs	Sun Dec 21 01:38:34 2008
@@ -37,7 +37,7 @@
 
 	public class FilterTotem : Beagle.Daemon.Filter {
 
-		static bool Debug = false;
+		static bool Debug = Beagle.Util.Debug.Enabled ("FilterTotem");
 
 		public FilterTotem ()
 		{			

Modified: trunk/beagle/Util/Makefile.am
==============================================================================
--- trunk/beagle/Util/Makefile.am	(original)
+++ trunk/beagle/Util/Makefile.am	Sun Dec 21 01:38:34 2008
@@ -63,6 +63,7 @@
 	$(srcdir)/camel.cs              	\
 	$(srcdir)/Config.cs			\
 	$(srcdir)/DateTimeUtil.cs		\
+	$(srcdir)/Debug.cs			\
 	$(srcdir)/DelayedTextWriter.cs		\
 	$(srcdir)/DigikamTags.cs		\
 	$(srcdir)/DirectoryWalker.cs		\

Modified: trunk/beagle/Util/Scheduler.cs
==============================================================================
--- trunk/beagle/Util/Scheduler.cs	(original)
+++ trunk/beagle/Util/Scheduler.cs	Sun Dec 21 01:38:34 2008
@@ -39,7 +39,7 @@
 		public delegate void EmptyQueueDelegate ();
 		public event EmptyQueueDelegate EmptyQueueEvent;
 
-		private static bool Debug = false;
+		private static bool Debug = Beagle.Util.Debug.Enabled ("Scheduler");
 
 		public enum Priority {
 

Modified: trunk/beagle/Util/TopScores.cs
==============================================================================
--- trunk/beagle/Util/TopScores.cs	(original)
+++ trunk/beagle/Util/TopScores.cs	Sun Dec 21 01:38:34 2008
@@ -31,7 +31,7 @@
 
 	public class TopScores {
 
-		private bool Debug = false;
+		private static bool Debug = Beagle.Util.Debug.Enabled ("TopScores");
 
 		private struct Node {
 			public long Score;

Modified: trunk/beagle/Util/XmlFu.cs
==============================================================================
--- trunk/beagle/Util/XmlFu.cs	(original)
+++ trunk/beagle/Util/XmlFu.cs	Sun Dec 21 01:38:34 2008
@@ -34,7 +34,7 @@
 
 	public class XmlFu {
 
-		public static bool Debug = false;
+		public static bool Debug = Beagle.Util.Debug.Enabled ("XmlFu");
 
 		public static void SerializeUtf8 (XmlSerializer serializer, Stream stream, object o)
 		{

Modified: trunk/beagle/beagled/FileAttributesStore.cs
==============================================================================
--- trunk/beagle/beagled/FileAttributesStore.cs	(original)
+++ trunk/beagle/beagled/FileAttributesStore.cs	Sun Dec 21 01:38:34 2008
@@ -32,7 +32,7 @@
 
 	public class FileAttributesStore : IDisposable {
 		
-		private static bool Debug = false;
+		private static bool Debug = Beagle.Util.Debug.Enabled ("FileAttributesStore");
 
 		private IFileAttributesStore ifas;
 

Modified: trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs
==============================================================================
--- trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs	(original)
+++ trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs	Sun Dec 21 01:38:34 2008
@@ -40,7 +40,7 @@
 	[QueryableFlavor (Name="Files", Domain=QueryDomain.Local | QueryDomain.Neighborhood, RequireInotify=false)]
 	public class FileSystemQueryable : LuceneQueryable {
 
-		static internal bool Debug = false;
+		static internal bool Debug = Beagle.Util.Debug.Enabled ("FSQ");
 
 		// History:
 		// 1: Initially set to force a reindex due to NameIndex changes.
@@ -84,9 +84,6 @@
 
 		public FileSystemQueryable () : base ("FileSystemIndex", MINOR_VERSION)
 		{
-			if (! Debug)
-				Debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FSQ") != null);
-
 			// Set up our event backend
 			if (Inotify.Enabled) {
                                 Logger.Log.Debug ("Starting Inotify FSQ file event backend");

Modified: trunk/beagle/beagled/Filter.cs
==============================================================================
--- trunk/beagle/beagled/Filter.cs	(original)
+++ trunk/beagle/beagled/Filter.cs	Sun Dec 21 01:38:34 2008
@@ -39,7 +39,7 @@
 
 	public class Filter {
 
-		static private bool Debug = false;
+		static private bool Debug = Beagle.Util.Debug.Enabled ("Filter");
 
 		// Number of characters Filters should return in each DoPull()
 		// Optimization hint. -1 means unlimited.

Modified: trunk/beagle/beagled/FilterFactory.cs
==============================================================================
--- trunk/beagle/beagled/FilterFactory.cs	(original)
+++ trunk/beagle/beagled/FilterFactory.cs	Sun Dec 21 01:38:34 2008
@@ -40,7 +40,7 @@
 
 	public class FilterFactory {
 
-		static private bool Debug = false;
+		static private bool Debug = Beagle.Util.Debug.Enabled ("FilterFactory");
 
 		class FilterCache {
 			private int version = 1;

Modified: trunk/beagle/beagled/LuceneBitArray.cs
==============================================================================
--- trunk/beagle/beagled/LuceneBitArray.cs	(original)
+++ trunk/beagle/beagled/LuceneBitArray.cs	Sun Dec 21 01:38:34 2008
@@ -50,7 +50,7 @@
 			}
 		}
 
-		private static bool Debug = false;
+		private static bool Debug = Beagle.Util.Debug.Enabled ("LuceneBitArray");
 
 		private LNS.IndexSearcher searcher;
 		private BitArrayHitCollector collector;

Modified: trunk/beagle/beagled/LuceneQueryingDriver.cs
==============================================================================
--- trunk/beagle/beagled/LuceneQueryingDriver.cs	(original)
+++ trunk/beagle/beagled/LuceneQueryingDriver.cs	Sun Dec 21 01:38:34 2008
@@ -49,7 +49,7 @@
 
 	public class LuceneQueryingDriver : LuceneCommon {
 
-		static private bool Debug = false;
+		static private bool Debug = Beagle.Util.Debug.Enabled ("LuceneQueryingDriver");
 
 		public delegate double RelevancyMultiplier (Hit hit);
 

Modified: trunk/beagle/beagled/QueryResult.cs
==============================================================================
--- trunk/beagle/beagled/QueryResult.cs	(original)
+++ trunk/beagle/beagled/QueryResult.cs	Sun Dec 21 01:38:34 2008
@@ -27,7 +27,7 @@
 
 using System;
 using System.Collections;
-using System.Diagnostics;
+using Debug = System.Diagnostics.Debug;
 using System.Threading;
 using Beagle.Util;
 

Modified: trunk/beagle/beagled/Shutdown.cs
==============================================================================
--- trunk/beagle/beagled/Shutdown.cs	(original)
+++ trunk/beagle/beagled/Shutdown.cs	Sun Dec 21 01:38:34 2008
@@ -35,7 +35,7 @@
 
 	public class Shutdown {
 
-		static public bool Debug = false;
+		static public bool Debug = Beagle.Util.Debug.Enabled ("Shutdown");
 
 		static object shutdownLock = new object ();
 		static Hashtable workers = new Hashtable ();

Modified: trunk/beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs
==============================================================================
--- trunk/beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs	(original)
+++ trunk/beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs	Sun Dec 21 01:38:34 2008
@@ -330,7 +330,7 @@
 				GetText (document, "FolderFile"), 
 				GetText (document, "MessageKey")));
 		}
-		
+
 		private GMime.Message GetGMimeMessage (string file, int offset, int size)
 		{
 			GMime.Message msg = null;
@@ -401,9 +401,9 @@
 			indexable.AddProperty (Property.NewKeyword ("fixme:folder", GetText (document, "Folder")));
 			indexable.AddProperty (Property.NewUnsearched ("ParentUri", GetText (document, "FolderFile")));
 			indexable.AddProperty (Property.NewUnsearched ("fixme:uri", GetText (document, "Uri")));
-			
+
 			message.Dispose ();
-			
+
 			return indexable;
 		}