Skip to content

Commit 55a8f6f

Browse files
committed
Remove Msf::DBManager::Sink
MSP-11614 `Msf::DBManager::Sink` contains code for a `sink` that is a meant to serialize database events, but it's unneeded because all database events go directly through ActiveRecord, which handles threading.
1 parent 8863367 commit 55a8f6f

File tree

4 files changed

+0
-49
lines changed

4 files changed

+0
-49
lines changed

lib/msf/core/db_manager.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class Msf::DBManager
4747
autoload :Service, 'msf/core/db_manager/service'
4848
autoload :Session, 'msf/core/db_manager/session'
4949
autoload :SessionEvent, 'msf/core/db_manager/session_event'
50-
autoload :Sink, 'msf/core/db_manager/sink'
5150
autoload :Task, 'msf/core/db_manager/task'
5251
autoload :Vuln, 'msf/core/db_manager/vuln'
5352
autoload :VulnAttempt, 'msf/core/db_manager/vuln_attempt'
@@ -80,7 +79,6 @@ class Msf::DBManager
8079
include Msf::DBManager::Service
8180
include Msf::DBManager::Session
8281
include Msf::DBManager::SessionEvent
83-
include Msf::DBManager::Sink
8482
include Msf::DBManager::Task
8583
include Msf::DBManager::Vuln
8684
include Msf::DBManager::VulnAttempt
@@ -160,11 +158,6 @@ def initialize_database_support
160158
#
161159
initialize_adapter
162160

163-
#
164-
# Instantiate the database sink
165-
#
166-
initialize_sink
167-
168161
true
169162
end
170163

lib/msf/core/db_manager/sink.rb

Lines changed: 0 additions & 34 deletions
This file was deleted.

spec/lib/msf/db_manager_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
it_should_behave_like 'Msf::DBManager::Service'
4141
it_should_behave_like 'Msf::DBManager::Session'
4242
it_should_behave_like 'Msf::DBManager::SessionEvent'
43-
it_should_behave_like 'Msf::DBManager::Sink'
4443
it_should_behave_like 'Msf::DBManager::Task'
4544
it_should_behave_like 'Msf::DBManager::Vuln'
4645
it_should_behave_like 'Msf::DBManager::VulnAttempt'

spec/support/shared/examples/msf/db_manager/sink.rb

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)