merlin 0.1.11 → 0.1.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/merlin/configuration.rb +3 -3
- data/lib/merlin/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1a96b0955fb7d27ce1d2f641e516edbd7d45c139
|
|
4
|
+
data.tar.gz: 59a7c819d20bfb6384296a4497e0650184f7a762
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3282098e17f0e448edea320aec6c5baa12fe5e95e0be887b6b716d1d042e2fd052f9a8e5b2372108758d025cb70e6a258ffd7493f0d67448867d9c0da3c3d635
|
|
7
|
+
data.tar.gz: d4e1b49c90504621558688c00da463ff68204e367c1555a5e065407d23ec8ed44afc3ca95629013864a6acc86d7074af8025744a73fb2d134313035dea60cc6a
|
data/lib/merlin/configuration.rb
CHANGED
|
@@ -56,9 +56,9 @@ module Merlin
|
|
|
56
56
|
conn.adapter Faraday.default_adapter
|
|
57
57
|
end
|
|
58
58
|
|
|
59
|
-
Timeout.timeout(REMOTE_FETCH_TIMEOUT, Faraday::Error::ConnectionFailed)
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
response = Timeout.timeout(REMOTE_FETCH_TIMEOUT, Faraday::Error::ConnectionFailed) {
|
|
60
|
+
connection.get "/config/#{@environment}.json"
|
|
61
|
+
}
|
|
62
62
|
|
|
63
63
|
if response.status == 200
|
|
64
64
|
result = response.body
|
data/lib/merlin/version.rb
CHANGED