From 213c06863134367054898c2ccd2ea4d0f8704751 Mon Sep 17 00:00:00 2001 From: John Kerry Date: Mon, 18 Feb 2019 09:43:57 -0500 Subject: [PATCH 1/2] adding a read_timeout config option and a version bump Signed-off-by: John Kerry --- lib/salt/api/client.rb | 1 + lib/salt/api/configure.rb | 1 + lib/salt/api/version.rb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/salt/api/client.rb b/lib/salt/api/client.rb index ed60fa8..cb43226 100644 --- a/lib/salt/api/client.rb +++ b/lib/salt/api/client.rb @@ -8,6 +8,7 @@ def client Net::HTTP.new(hostname, port).tap do |client| client.use_ssl = use_ssl client.open_timeout = timeout + client.read_timeout = read_timeout # TODO: Allow specifying CA and such client.verify_mode = OpenSSL::SSL::VERIFY_NONE end diff --git a/lib/salt/api/configure.rb b/lib/salt/api/configure.rb index 28f5d1d..331f174 100644 --- a/lib/salt/api/configure.rb +++ b/lib/salt/api/configure.rb @@ -6,6 +6,7 @@ module Configure :username, :password, :timeout, + :read_timeout, :eauth, :port, :use_ssl diff --git a/lib/salt/api/version.rb b/lib/salt/api/version.rb index cdee217..28979b1 100644 --- a/lib/salt/api/version.rb +++ b/lib/salt/api/version.rb @@ -1,5 +1,5 @@ module Salt module Api - VERSION = "0.1.4" + VERSION = "0.1.5" end end From c30c94b3a5310f5512e9c0a6c64ef131de8c76cf Mon Sep 17 00:00:00 2001 From: John Kerry Date: Mon, 18 Feb 2019 14:02:21 -0500 Subject: [PATCH 2/2] bumping version to 0.1.6 since there appears to be a 0.1.5 in the wild Signed-off-by: John Kerry --- lib/salt/api/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/salt/api/version.rb b/lib/salt/api/version.rb index 28979b1..b61b9a0 100644 --- a/lib/salt/api/version.rb +++ b/lib/salt/api/version.rb @@ -1,5 +1,5 @@ module Salt module Api - VERSION = "0.1.5" + VERSION = "0.1.6" end end