summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-07-06 13:59:46 -0600
committermo khan <mo@mokhan.ca>2025-07-06 13:59:46 -0600
commitbba121d0242323f83e298c3725ac4df176c62417 (patch)
tree3bff02fa0650c86da84818d6d940b9b81cc3a359 /lib
parentd36b6e4f7c99b96aee01656e2ca57312d77a55b6 (diff)
parent58d4e9be69cf5fbc951bc63858ac899dded47bee (diff)
resolve: merge conflicts with main branch
- Merge latest main branch changes including Ruby 3.2+ requirement - Combine new stdlib dependencies with Rust extension support - Maintain backward compatibility while adding new features 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/net/hippie.rb2
-rw-r--r--lib/net/hippie/client.rb2
-rw-r--r--lib/net/hippie/connection.rb2
-rw-r--r--lib/net/hippie/version.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/net/hippie.rb b/lib/net/hippie.rb
index b19ab63..d057f52 100644
--- a/lib/net/hippie.rb
+++ b/lib/net/hippie.rb
@@ -32,7 +32,7 @@ module Net
].freeze
def self.logger
- @logger ||= Logger.new($stderr)
+ @logger ||= Logger.new(nil)
end
def self.logger=(logger)
diff --git a/lib/net/hippie/client.rb b/lib/net/hippie/client.rb
index 5beec1e..340531b 100644
--- a/lib/net/hippie/client.rb
+++ b/lib/net/hippie/client.rb
@@ -84,7 +84,7 @@ module Net
raise error if attempt == max
delay = ((2**attempt) * 0.1) + Random.rand(0.05) # delay + jitter
- logger.warn("`#{error.message}` #{attempt + 1}/#{max} Delay: #{delay}s")
+ logger&.warn("`#{error.message}` #{attempt + 1}/#{max} Delay: #{delay}s")
sleep delay
end
diff --git a/lib/net/hippie/connection.rb b/lib/net/hippie/connection.rb
index 35a478a..83097ff 100644
--- a/lib/net/hippie/connection.rb
+++ b/lib/net/hippie/connection.rb
@@ -49,7 +49,7 @@ module Net
http.open_timeout = options.fetch(:open_timeout, 10)
http.use_ssl = scheme == 'https'
http.verify_mode = options.fetch(:verify_mode, Net::Hippie.verify_mode)
- http.set_debug_output(options.fetch(:logger, Net::Hippie.logger))
+ http.set_debug_output(options[:logger]) if options[:logger]
apply_client_tls_to(http, options)
@http = http
end
diff --git a/lib/net/hippie/version.rb b/lib/net/hippie/version.rb
index 87af671..07de45b 100644
--- a/lib/net/hippie/version.rb
+++ b/lib/net/hippie/version.rb
@@ -2,6 +2,6 @@
module Net
module Hippie
- VERSION = '1.1.1'
+ VERSION = '1.3.0'
end
end