Remove AR patch stuff; attempting to debug non-connection between MSF…

… and Pro
rapid7 · Jan 24, 2012 · 531c1e6 · 531c1e6
1 parent 4586112
commit 531c1e6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 66 deletions.
diff --git a/lib/msf/core/model.rb b/lib/msf/core/model.rb
@@ -1,8 +1,6 @@
 
 require 'msf/core/model/serialized_prefs'
 
-require 'msf/core/model/activerecord_patches'
-
 require 'msf/core/model/user'
 require 'msf/core/model/api_key'
 require 'msf/core/model/macro'

diff --git a/lib/msf/core/model/activerecord_patches.rb b/lib/msf/core/model/activerecord_patches.rb
diff --git a/lib/msf/core/model/session.rb b/lib/msf/core/model/session.rb
@@ -9,8 +9,8 @@ class Session < ActiveRecord::Base
 	has_many :events, :class_name => "SessionEvent", :order => "created_at"
 	has_many :routes
 
-	named_scope :alive, :conditions => "closed_at IS NULL"
-	named_scope :dead, :conditions => "closed_at IS NOT NULL"
+	scope :alive, :conditions => "closed_at IS NULL"
+	scope :dead, :conditions => "closed_at IS NOT NULL"
 
 	serialize :datastore
 end

diff --git a/lib/msf/core/rpc/v10/service.rb b/lib/msf/core/rpc/v10/service.rb
@@ -145,7 +145,7 @@ def process(req)
 				end
 			end
 
-			::Timeout.timeout(self.dispatcher_timeout) { self.handlers[group].send(mname, *msg) }
+			::Timeout.timeout(self.dispatcher_timeout) { puts "Group: #{group} Mname: #{mname}";self.handlers[group].send(mname, *msg) }
 
 		rescue ::Exception => e
 			elog("RPC Exception: #{e.class} #{e.to_s} #{e.backtrace} #{msg.inspect} #{req.inspect}")