Move the thread tracking into the update method

Author: HD Moore

lib/msf/core/db_manager.rb

@@ -342,6 +342,8 @@ def update_all_module_details
 		return if not self.migrated
 		return if self.modules_caching
 
+		self.framework.cache_thread = Thread.current
+
 		self.modules_cached  = false
 		self.modules_caching = true
 
@@ -394,6 +396,9 @@ def update_all_module_details
 			end
 		end
 
+		self.framework.cache_initialized = true
+		self.framework.cache_thread = nil
+
 		self.modules_cached  = true
 		self.modules_caching = false
 

lib/msf/ui/console/driver.rb

@@ -228,10 +228,7 @@ def initialize(prompt = DefaultPrompt, prompt_char = DefaultPromptChar, opts = {
 
 			# Rebuild the module cache in a background thread
 			self.framework.threads.spawn("ModuleCacheRebuild", true) do
-				self.framework.cache_thread = Thread.current
 				self.framework.modules.refresh_cache_from_module_files
-				self.framework.cache_initialized = true
-				self.framework.cache_thread = nil
 			end
 		end