From b980ec2a16b569668336360d5ca67437c06072ac Mon Sep 17 00:00:00 2001 From: Katelyn Kasperowicz Date: Wed, 16 Sep 2015 14:01:18 -0700 Subject: [PATCH 1/2] Add env variable to stop logging of http cookie warnings --- lib/httpclient/cookie.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/httpclient/cookie.rb b/lib/httpclient/cookie.rb index 6bd49401..758d5fcf 100644 --- a/lib/httpclient/cookie.rb +++ b/lib/httpclient/cookie.rb @@ -68,7 +68,7 @@ def add(cookie) end def find(uri) - warn('CookieManager#find is deprecated and will be removed in near future. Use HTTP::Cookie.cookie_value(CookieManager#cookies) instead') + warn('CookieManager#find is deprecated and will be removed in near future. Use HTTP::Cookie.cookie_value(CookieManager#cookies) instead') if log_http_cookie_warnings? if cookie = cookies(uri) HTTP::Cookie.cookie_value(cookie) end @@ -194,7 +194,7 @@ def http_only? alias original_domain domain def domain - warn('Cookie#domain returns dot-less domain name now. Use Cookie#dot_domain if you need "." at the beginning.') + warn('Cookie#domain returns dot-less domain name now. Use Cookie#dot_domain if you need "." at the beginning.') if log_http_cookie_warnings? self.original_domain end @@ -206,7 +206,7 @@ def flag private def deprecated(old, new) - unless @@warned + unless @@warned && log_http_cookie_warnings? warn("WebAgent::Cookie is deprecated and will be replaced with HTTP::Cookie in the near future. Please use Cookie##{new} instead of Cookie##{old} for the replacement.") @@warned = true end @@ -214,6 +214,10 @@ def deprecated(old, new) end end +private + def log_http_cookie_warnings? + ENV['HTTPCLIENT_LOG_HTTP_COOKIE_WARNING'] != false + end rescue LoadError require 'httpclient/webagent-cookie' end From 9b5ced6505228883d717ad00e75d1a9b53d5345a Mon Sep 17 00:00:00 2001 From: Katelyn Kasperowicz Date: Wed, 16 Sep 2015 16:19:34 -0700 Subject: [PATCH 2/2] Use string rather than boolean for env & fix 1 log check --- lib/httpclient/cookie.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/httpclient/cookie.rb b/lib/httpclient/cookie.rb index 758d5fcf..76932f57 100644 --- a/lib/httpclient/cookie.rb +++ b/lib/httpclient/cookie.rb @@ -206,7 +206,7 @@ def flag private def deprecated(old, new) - unless @@warned && log_http_cookie_warnings? + unless @@warned || !log_http_cookie_warnings? warn("WebAgent::Cookie is deprecated and will be replaced with HTTP::Cookie in the near future. Please use Cookie##{new} instead of Cookie##{old} for the replacement.") @@warned = true end @@ -214,10 +214,9 @@ def deprecated(old, new) end end -private - def log_http_cookie_warnings? - ENV['HTTPCLIENT_LOG_HTTP_COOKIE_WARNING'] != false - end +def log_http_cookie_warnings? + ENV['HTTPCLIENT_LOG_HTTP_COOKIE_WARNING'] != "disabled" +end rescue LoadError require 'httpclient/webagent-cookie' end