process_settings 0.11.0.pre.6 → 0.11.0.pre.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/process_settings/file_monitor.rb +20 -20
- data/lib/process_settings/version.rb +1 -1
- 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: be2ecaa41e362b6bbdfdb93a2ad08ec6e61bb444b43a757acc2062ce3e666fbc
|
|
4
|
+
data.tar.gz: 4cdecb04dbde4ba79bd0dd41ae4e2a37591b8aa1c1bc09a6d5b2c23f0d3ec409
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4e23f89dd2cdc890074d3fdb3eac84702a6e791ecfa61bb954fb1ed1addda947f0f21041ce2f485e0808ca6fb75a5d7137663b8777434b22c1596f2def0c2bb1
|
|
7
|
+
data.tar.gz: 74e411fae551d1a14fb39e7cd1a769b2515a9e25bdf72844ba1d3c1510abd833bf3ae6ecd047bd21112746e9836bfc9d6da60616bba644532c44bfe30de90a32
|
|
@@ -13,7 +13,7 @@ module ProcessSettings
|
|
|
13
13
|
class FileMonitor < AbstractMonitor
|
|
14
14
|
attr_reader :file_path, :untargeted_settings
|
|
15
15
|
|
|
16
|
-
def initialize(file_path, logger:)
|
|
16
|
+
def initialize(file_path, logger:, environment: nil)
|
|
17
17
|
super(logger: logger)
|
|
18
18
|
|
|
19
19
|
@file_path = File.expand_path(file_path)
|
|
@@ -21,7 +21,7 @@ module ProcessSettings
|
|
|
21
21
|
@untargeted_settings = nil
|
|
22
22
|
@last_untargetted_settings = nil
|
|
23
23
|
|
|
24
|
-
start_internal(enable_listen_thread?)
|
|
24
|
+
start_internal(enable_listen_thread?(environment))
|
|
25
25
|
end
|
|
26
26
|
|
|
27
27
|
def start
|
|
@@ -29,6 +29,23 @@ module ProcessSettings
|
|
|
29
29
|
end
|
|
30
30
|
deprecate :start, deprecator: ActiveSupport::Deprecation.new('1.0', 'ProcessSettings') # will become private
|
|
31
31
|
|
|
32
|
+
def enable_listen_thread?(environment)
|
|
33
|
+
!disable_listen_thread?
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
def disable_listen_thread?(environment = nil)
|
|
37
|
+
case ENV['DISABLE_LISTEN_CHANGE_MONITORING']
|
|
38
|
+
when 'true', '1'
|
|
39
|
+
true
|
|
40
|
+
when 'false', '0'
|
|
41
|
+
false
|
|
42
|
+
when nil
|
|
43
|
+
environment || service_env == 'test'
|
|
44
|
+
else
|
|
45
|
+
raise ArgumentError, "DISABLE_LISTEN_CHANGE_MONITORING has unknown value #{ENV['DISABLE_LISTEN_CHANGE_MONITORING'].inspect}"
|
|
46
|
+
end
|
|
47
|
+
end
|
|
48
|
+
|
|
32
49
|
private
|
|
33
50
|
|
|
34
51
|
# optionally starts listening for changes, then loads current settings
|
|
@@ -67,27 +84,10 @@ module ProcessSettings
|
|
|
67
84
|
@listener&.stop
|
|
68
85
|
end
|
|
69
86
|
|
|
70
|
-
def enable_listen_thread?
|
|
71
|
-
!disable_listen_thread?
|
|
72
|
-
end
|
|
73
|
-
|
|
74
|
-
def disable_listen_thread?
|
|
75
|
-
case ENV['DISABLE_LISTEN_CHANGE_MONITORING']
|
|
76
|
-
when 'true', '1'
|
|
77
|
-
true
|
|
78
|
-
when 'false', '0'
|
|
79
|
-
false
|
|
80
|
-
when nil
|
|
81
|
-
service_env == 'test'
|
|
82
|
-
else
|
|
83
|
-
raise ArgumentError, "DISABLE_LISTEN_CHANGE_MONITORING has unknown value #{ENV['DISABLE_LISTEN_CHANGE_MONITORING'].inspect}"
|
|
84
|
-
end
|
|
85
|
-
end
|
|
86
|
-
|
|
87
87
|
def service_env
|
|
88
88
|
if defined?(Rails) && Rails.respond_to?(:env)
|
|
89
89
|
Rails.env
|
|
90
|
-
end || ENV['SERVICE_ENV']
|
|
90
|
+
end || ENV['RAILS_ENV'] || ENV['SERVICE_ENV']
|
|
91
91
|
end
|
|
92
92
|
|
|
93
93
|
# Loads the most recent settings from disk
|