Skip to content

Commit 0ab991b

Browse files
Fix deleting services with services -d
1 parent 5e254f2 commit 0ab991b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

lib/msf/core/db_manager/service.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ def delete_service(opts)
66
::ApplicationRecord.connection_pool.with_connection {
77
deleted = []
88
opts[:ids].each do |service_id|
9-
service = Mdm::Service.find(service_id)
9+
begin
10+
service = Mdm::Service.find(service_id)
11+
rescue ActiveRecord::RecordNotFound
12+
# This happens when the service was the child of another service we have already deleted
13+
# Deletion of children is automatic via dependent: :destroy on the association
14+
dlog("Service with id #{service_id} already deleted")
15+
next
16+
end
1017
begin
1118
deleted << service.destroy
1219
rescue

0 commit comments

Comments
 (0)