summaryrefslogtreecommitdiff
path: root/lib/rbot
diff options
context:
space:
mode:
authordmitry kim <jason@nichego.net>2009-01-27 18:11:31 +0300
committerdmitry kim <jason@nichego.net>2009-01-28 00:45:04 +0300
commit4b0ee2583092fe221eed83f73055dfbcf691fde2 (patch)
tree23652d94bd62ea0ace569ab463864d10eaea5cd4 /lib/rbot
parentb0a372c2e93194a5573197e173c3e8409df5e25a (diff)
* (httputils) get_response must refresh the cached object even if :cache => false
Diffstat (limited to 'lib/rbot')
-rw-r--r--lib/rbot/core/utils/httputil.rb28
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/rbot/core/utils/httputil.rb b/lib/rbot/core/utils/httputil.rb
index 9792e0c5..68e00ba5 100644
--- a/lib/rbot/core/utils/httputil.rb
+++ b/lib/rbot/core/utils/httputil.rb
@@ -498,7 +498,6 @@ class HttpUtil
}.merge(options)
resp = nil
- cached = nil
req_class = case opts[:method].to_s.downcase.intern
when :head, :"net::http::head"
@@ -532,7 +531,9 @@ class HttpUtil
debug "get_response(#{uri}, #{opts.inspect})"
- if opts[:cache] && cached = @cache[cache_key]
+ cached = @cache[cache_key]
+
+ if opts[:cache] && cached
debug "got cached"
if !cached.expired?
debug "using cached"
@@ -545,7 +546,10 @@ class HttpUtil
headers['Range'] = opts[:range] if opts[:range]
headers['Authorization'] = opts[:auth_head] if opts[:auth_head]
- cached.setup_headers(headers) if cached && (req_class == Net::HTTP::Get)
+ if opts[:cache] && cached && (req_class == Net::HTTP::Get)
+ cached.setup_headers headers
+ end
+
req = req_class.new(uri.request_uri, headers)
if uri.user && uri.password
req.basic_auth(uri.user, uri.password)
@@ -570,18 +574,16 @@ class HttpUtil
elsif Net::HTTPServerError === resp || Net::HTTPClientError === resp
debug "http error, deleting cached obj" if cached
@cache.delete(cache_key)
- elsif opts[:cache]
- begin
- return handle_response(uri, resp, opts, &block)
- ensure
- if cached = CachedObject.maybe_new(resp) rescue nil
- debug "storing to cache"
- @cache[cache_key] = cached
- end
+ end
+
+ begin
+ return handle_response(uri, resp, opts, &block)
+ ensure
+ if cached = CachedObject.maybe_new(resp) rescue nil
+ debug "storing to cache"
+ @cache[cache_key] = cached
end
- return ret
end
- return handle_response(uri, resp, opts, &block)
end
end
rescue Exception => e