lusnoc 1.0.1.81647 → 1.0.1.81655
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/lusnoc/configuration.rb +2 -1
- data/lib/lusnoc.rb +29 -10
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9d8b6fb803c649e27c50cc60efa54a883457c5b5a326e06a2710d4b33c35624a
|
4
|
+
data.tar.gz: 88432501ac7df9c532d8ea95c9425aa7b3aa381ebddf9092a67fd207af6c91e6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c4deed444ac90080936f49962c954d4f81799523ea2d054e247a835b57b85204a7150a6e7040034fc85b6fa0feba69eedf01aeeb1b55e75a85b2a902a87857de
|
7
|
+
data.tar.gz: 1dd863908e52441edfc91c62e86ba8abcefad15d22f445889057a2ce3cf9386d8d42557d9839c1966f25dce2d48597f214bf20effb11dea027e69266ff8898fc
|
data/lib/lusnoc/configuration.rb
CHANGED
@@ -4,7 +4,7 @@ module Lusnoc
|
|
4
4
|
# Methods for configuring Lusnoc
|
5
5
|
class Configuration
|
6
6
|
|
7
|
-
attr_accessor :url, :acl_token, :logger
|
7
|
+
attr_accessor :url, :acl_token, :logger, :http_timeout
|
8
8
|
|
9
9
|
# Override defaults for configuration
|
10
10
|
# @param url [String] consul's connection URL
|
@@ -13,6 +13,7 @@ module Lusnoc
|
|
13
13
|
@url = url
|
14
14
|
@acl_token = acl_token
|
15
15
|
@logger = Logger.new(STDOUT, level: Logger::INFO, progname: 'Lusnoc')
|
16
|
+
@http_timeout = 5
|
16
17
|
end
|
17
18
|
|
18
19
|
end
|
data/lib/lusnoc.rb
CHANGED
@@ -24,7 +24,7 @@ module Lusnoc
|
|
24
24
|
yield(configuration)
|
25
25
|
end
|
26
26
|
|
27
|
-
def http_get(url, timeout:
|
27
|
+
def http_get(url, timeout: Lusnoc.configuration.http_timeout)
|
28
28
|
uri = URI(url)
|
29
29
|
|
30
30
|
with_http(uri, timeout: timeout) do |http|
|
@@ -36,7 +36,7 @@ module Lusnoc
|
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
39
|
-
def http_put(url, value = nil, timeout:
|
39
|
+
def http_put(url, value = nil, timeout: Lusnoc.configuration.http_timeout)
|
40
40
|
uri = URI(url)
|
41
41
|
data = value.is_a?(String) ? value : JSON.generate(value) unless value.nil?
|
42
42
|
|
@@ -55,14 +55,33 @@ module Lusnoc
|
|
55
55
|
private
|
56
56
|
|
57
57
|
def with_http(uri, timeout:)
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
58
|
+
with_retry(delay: 0.1) do
|
59
|
+
Net::HTTP.start(uri.host, uri.port,
|
60
|
+
use_ssl: uri.scheme == 'https',
|
61
|
+
read_timeout: timeout,
|
62
|
+
open_timeout: timeout,
|
63
|
+
continue_timeout: timeout,
|
64
|
+
write_timeout: timeout,
|
65
|
+
max_retries: 1) do |http|
|
66
|
+
yield(http)
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
def with_retry(count = 2, delay: 1, klass: nil)
|
72
|
+
begin
|
73
|
+
retries ||= 0
|
74
|
+
yield(retries)
|
75
|
+
rescue StandardError => e
|
76
|
+
sleep(delay + (retries**2) * delay)
|
77
|
+
if (retries += 1) < count
|
78
|
+
retry
|
79
|
+
else
|
80
|
+
raise if klass.nil?
|
81
|
+
return nil if klass == :skip
|
82
|
+
|
83
|
+
raise klass.new(e.message)
|
84
|
+
end
|
66
85
|
end
|
67
86
|
end
|
68
87
|
|