sensu-settings 9.2.0 → 9.2.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e1b81eae55c8690a5b2ac6e492b2e5bdc1e1dea5
4
- data.tar.gz: 7703b6e12854c67d93535693003696529694d95a
3
+ metadata.gz: 9535abc85dad4a646d99a496e2d6c169aa4ecf2f
4
+ data.tar.gz: 434f2229f386145ae17090029c713383573ff484
5
5
  SHA512:
6
- metadata.gz: 5b6df1b910f9f61a7ba0f97cd4cbe7ae87e38421af01d709c5e7ea7cec781e93028d5ef3074288913932bcb4840a38b1061d54104f8232f4d7b101c4ab992799
7
- data.tar.gz: f46512869ee3898cbf1b4a816c3d0c12f6a6d67ed6b752e005569d104688a4a66da26f18d51fc3891e3eb1c9ee5205a94f508e2fd231d3eaa8a3bec5f49ada34
6
+ metadata.gz: 9883f235e4fbb3bebaf712f4583d1fe9e251b93438cd19c180d31456bdec0c695337419acd14e710554b29cfe3a4bd7615cc61883d1d61349dd3d282b949187e
7
+ data.tar.gz: 401caef5ad113acd84f48f314c1a8ecbc1d8ddae539861d4b80f347dfa1dfdb08eef164f555a00eedd0e1e5313eeb3e0ba5c64cf9fafddc506e5285769d1e11e
@@ -5,6 +5,11 @@ module Sensu
5
5
  class << self
6
6
  # Load Sensu settings.
7
7
  #
8
+ # Settings are loaded in following order, prior to validation:
9
+ # 1. Environment Variables
10
+ # 2. JSON files on disk
11
+ # 3. Automaticly detected overrides (e.g. hostname, IP address)
12
+ #
8
13
  # @param [Hash] options
9
14
  # @option options [String] :config_file to load.
10
15
  # @option options [String] :config_dir to load.
@@ -24,10 +29,10 @@ module Sensu
24
29
  @loader.load_directory(directory)
25
30
  end
26
31
  end
32
+ @loader.load_overrides!
27
33
  if @loader.validate.empty?
28
34
  @loader.set_env!
29
35
  end
30
- @loader.load_overrides!
31
36
  @loader
32
37
  rescue Loader::Error
33
38
  @loader
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |spec|
4
4
  spec.name = "sensu-settings"
5
- spec.version = "9.2.0"
5
+ spec.version = "9.2.1"
6
6
  spec.authors = ["Sean Porter"]
7
7
  spec.email = ["portertech@gmail.com"]
8
8
  spec.summary = "The Sensu settings library, loader and validator"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sensu-settings
3
3
  version: !ruby/object:Gem::Version
4
- version: 9.2.0
4
+ version: 9.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Porter
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-09-20 00:00:00.000000000 Z
11
+ date: 2016-10-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sensu-json