Skip to content

fix memory leak introduced by connection pooling #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2019
Merged

fix memory leak introduced by connection pooling #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/net/http/persistent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,9 +1048,7 @@ def request_setup req_or_uri # :nodoc:
# #shutdown when you are completely done making requests!

def shutdown
@pool.available.shutdown do |http|
http.finish
end
@pool.shutdown { |http| http.finish }
end

##
Expand Down
12 changes: 8 additions & 4 deletions lib/net/http/persistent/pool.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ def initialize(options = {}, &block)
super

@available = Net::HTTP::Persistent::TimedStackMulti.new(@size, &block)
@key = :"current-#{@available.object_id}"
@key = "current-#{@available.object_id}"
end

def checkin net_http_args
stack = Thread.current[@key][net_http_args]
stack = Thread.current[@key][net_http_args] ||= []

raise ConnectionPool::Error, 'no connections are checked out' if
stack.empty?
Expand All @@ -26,8 +26,8 @@ def checkin net_http_args
end

def checkout net_http_args
stacks = Thread.current[@key] ||= Hash.new { |h, k| h[k] = [] }
stack = stacks[net_http_args]
stacks = Thread.current[@key] ||= {}
stack = stacks[net_http_args] ||= []

if stack.empty? then
conn = @available.pop connection_args: net_http_args
Expand All @@ -40,6 +40,10 @@ def checkout net_http_args
conn
end

def shutdown
Thread.current[@key] = nil
super
end
end

require 'net/http/persistent/timed_stack_multi'
Expand Down