merlin 0.1.10 → 0.1.11
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 +6 -1
- 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: b47af479a0458fba3651083349259752aa014e05
|
|
4
|
+
data.tar.gz: 82170ffd380799509d4e5808909f72a79ceaeb42
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 57ab7d65a006096c992adca93e9d09ac625ed6eca2c7dbc3a85fa18b96143782ef3399484f78381a5efaaf16201b5d51197bd6ebec78a0dfbd0f1e6784388f44
|
|
7
|
+
data.tar.gz: a739503c4dd49af5ead0920688e940e2daf8f39cc9ae110e6b88b53536e7efce4795282dd0086273e51463b2cea574609d7278dc24efcc776d97e1f320c1f1a6
|
data/lib/merlin/configuration.rb
CHANGED
|
@@ -5,6 +5,7 @@ require 'deep_merge' unless {}.respond_to?(:deep_merge)
|
|
|
5
5
|
require 'ostruct'
|
|
6
6
|
require 'json'
|
|
7
7
|
require 'logger'
|
|
8
|
+
require 'timeout'
|
|
8
9
|
|
|
9
10
|
class OpenStruct
|
|
10
11
|
def as_json(options = nil)
|
|
@@ -27,6 +28,7 @@ end
|
|
|
27
28
|
|
|
28
29
|
module Merlin
|
|
29
30
|
class Configuration
|
|
31
|
+
REMOTE_FETCH_TIMEOUT = 4 # 4 seconds
|
|
30
32
|
attr_reader :raw
|
|
31
33
|
|
|
32
34
|
def initialize(config_file_path, environment, logger = Logger.new(STDOUT), connection = nil)
|
|
@@ -54,7 +56,10 @@ module Merlin
|
|
|
54
56
|
conn.adapter Faraday.default_adapter
|
|
55
57
|
end
|
|
56
58
|
|
|
57
|
-
|
|
59
|
+
Timeout.timeout(REMOTE_FETCH_TIMEOUT, Faraday::Error::ConnectionFailed) do
|
|
60
|
+
response = connection.get "/config/#{@environment}.json"
|
|
61
|
+
end
|
|
62
|
+
|
|
58
63
|
if response.status == 200
|
|
59
64
|
result = response.body
|
|
60
65
|
dump_config(result) unless production_or_staging
|
data/lib/merlin/version.rb
CHANGED