Skip to content

Commit

Permalink
Remove connection pool patch
Browse files Browse the repository at this point in the history
  • Loading branch information
adfoster-r7 committed Nov 19, 2024
1 parent 2177fda commit c6633a3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/command_shell_acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
# Run all test individually, note there is a separate final job for aggregating the test results
test:
strategy:
fail-fast: false
fail-fast: true
matrix:
os:
- windows-2019
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shared_meterpreter_acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
if: always() && (needs.java_meterpreter_compilation.result == 'success' || needs.java_meterpreter_compilation.result == 'skipped')

strategy:
fail-fast: false
fail-fast: true
matrix:
os:
- macos-13
Expand Down
10 changes: 0 additions & 10 deletions lib/msf/core/thread_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,6 @@ def spawn(name, crit, *args, &block)
error: e
)
raise e
ensure
if framework.db && framework.db.active && framework.db.is_local?
# NOTE: despite the Deprecation Warning's advice, this should *NOT*
# be ApplicationRecord.connection.close which causes unrelated
# threads to raise ActiveRecord::StatementInvalid exceptions at
# some point in the future, presumably due to the pool manager
# believing that the connection is still usable and handing it out
# to another thread.
::ApplicationRecord.connection_pool.release_connection
end
end
end
else
Expand Down

0 comments on commit c6633a3

Please sign in to comment.