sensu-settings 9.2.1 → 9.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/sensu/settings/loader.rb +1 -1
  3. data/sensu-settings.gemspec +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9535abc85dad4a646d99a496e2d6c169aa4ecf2f
4
- data.tar.gz: 434f2229f386145ae17090029c713383573ff484
3
+ metadata.gz: e2314280ac8daa5b71f0db6f7cac9f5ed92d7d72
4
+ data.tar.gz: eda3885e2270d9b6637e520f33bd4a59c030b2c5
5
5
  SHA512:
6
- metadata.gz: 9883f235e4fbb3bebaf712f4583d1fe9e251b93438cd19c180d31456bdec0c695337419acd14e710554b29cfe3a4bd7615cc61883d1d61349dd3d282b949187e
7
- data.tar.gz: 401caef5ad113acd84f48f314c1a8ecbc1d8ddae539861d4b80f347dfa1dfdb08eef164f555a00eedd0e1e5313eeb3e0ba5c64cf9fafddc506e5285769d1e11e
6
+ metadata.gz: 5085a2b545881de199bb5877a29c0f2d29e79fe5110e9ed6ec3f0d3a468b637ed9fc80d2fbbf82a859a9b085b485f73fd46bffc29e968f58b05d6770bdb731bb
7
+ data.tar.gz: 0903d6116eec7051e0728878ed4d78c12349a4e07c4f5f784b68e67cad340e71d4b9f468e9e9ca449676b5f4badf572144c968e091dc01b5dc2bbc0206ac5463
data/lib/sensu/settings/loader.rb CHANGED
@@ -127,7 +127,7 @@ module Sensu
127
127
  begin
128
128
  warning("loading config file", :file => file)
129
129
  contents = read_config_file(file)
130
- config = Sensu::JSON.load(contents)
130
+ config = contents.empty? ? {} : Sensu::JSON.load(contents)
131
131
  merged = deep_merge(@settings, config)
132
132
  unless @loaded_files.empty?
133
133
  changes = deep_diff(@settings, merged)
data/sensu-settings.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |spec|
4
4
  spec.name = "sensu-settings"
5
- spec.version = "9.2.1"
5
+ spec.version = "9.2.2"
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.1
4
+ version: 9.2.2
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-10-12 00:00:00.000000000 Z
11
+ date: 2016-10-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sensu-json