Skip to content

Commit

Permalink
refs #7162, AWS gem monkey patches ActiveSupport methods
Browse files Browse the repository at this point in the history
  • Loading branch information
konstantin committed Jun 29, 2010
1 parent 4038644 commit fe5c7f2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions History.txt
Expand Up @@ -57,3 +57,6 @@ Initial public release
* fixed a bug: <NoMethodError: You have a nil object when you didn't expect it!
The error occurred while evaluating nil.body_stream>

== 1.2.5 (not released yet)

- ActiveSupport dependency removal
6 changes: 3 additions & 3 deletions lib/right_http_connection.rb
Expand Up @@ -34,7 +34,7 @@ module RightHttpConnection #:nodoc:
module VERSION #:nodoc:
MAJOR = 1 unless defined?(MAJOR)
MINOR = 2 unless defined?(MINOR)
TINY = 99 unless defined?(TINY)
TINY = 5 unless defined?(TINY)

STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(STRING)
end
Expand Down Expand Up @@ -237,7 +237,7 @@ def eof_time
# Returns true if we are receiving EOFs during last @params[:http_connection_retry_delay] seconds
# and there were no successful response from server
def raise_on_eof_exception?
@eof[@server].blank? ? false : ( (Time.now.to_i-@params[:http_connection_retry_delay]) > @eof[@server].last.to_i )
@eof[@server].nil? ? false : ( (Time.now.to_i-@params[:http_connection_retry_delay]) > @eof[@server].last.to_i )
end

# Reset a list of EOFs for this server.
Expand Down Expand Up @@ -439,7 +439,7 @@ def request(request_params, &block)

def finish(reason = '')
if @http && @http.started?
reason = ", reason: '#{reason}'" unless reason.blank?
reason = ", reason: '#{reason}'" unless reason.empty?
@logger.info("Closing #{@http.use_ssl? ? 'HTTPS' : 'HTTP'} connection to #{@http.address}:#{@http.port}#{reason}")
@http.finish
end
Expand Down

0 comments on commit fe5c7f2

Please sign in to comment.