beagle r4586 - trunk/beagle/beagled

[dbera svn gnome org]

Author: dbera
Date: Fri Mar  7 03:07:55 2008
New Revision: 4586
URL: http://svn.gnome.org/viewvc/beagle?rev=4586&view=rev

Log:
Currently LuceneIndexingDriver pauses during indexing generated indexables, asks the daemon and then continues. If shutdown is initiated during the pause then the tmpfiles for the generated indexables were left behind. Make sure to clean them up in that case.


Modified:
   trunk/beagle/beagled/LuceneIndexingDriver.cs

Modified: trunk/beagle/beagled/LuceneIndexingDriver.cs
==============================================================================
--- trunk/beagle/beagled/LuceneIndexingDriver.cs	(original)
+++ trunk/beagle/beagled/LuceneIndexingDriver.cs	Fri Mar  7 03:07:55 2008
@@ -50,6 +50,8 @@
 
 			if (build_usercache)
 				text_cache = TextCache.UserCache;
+
+			Shutdown.ShutdownEvent += OnShutdown;
 		}
 
 		public LuceneIndexingDriver (string index_name, int minor_version)
@@ -715,5 +717,15 @@
 			secondary_writer.AddIndexes (secondary_store);
 			secondary_writer.Close ();
 		}
+
+		//////////////////////////////////////////////////////
+
+		public void OnShutdown ()
+		{
+			lock (flush_lock) {
+				foreach (DeferredInfo di in deferred_indexables)
+					di.Cleanup ();
+			}
+		}
 	}
 }