Merge branch 'goliath' into loot_and_creds

Author: jbarnett-r7

lib/msf/core/thread_manager.rb

@@ -108,7 +108,7 @@ def spawn(name, crit, *args, &block)
           elog("Call Stack\n#{e.backtrace.join("\n")}")
           raise e
         ensure
-          if framework.db and framework.db.active framework.db.is_local?
+          if framework.db && framework.db.active && framework.db.is_local?
             # NOTE: despite the Deprecation Warning's advice, this should *NOT*
             # be ActiveRecord::Base.connection.close which causes unrelated
             # threads to raise ActiveRecord::StatementInvalid exceptions at