diff options
| author | Thom May <thom@may.lt> | 2016-11-28 22:37:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 22:37:18 +0000 |
| commit | 9dfd221f7de33d31e9f345de82cd90d963304a8f (patch) | |
| tree | 30fda8e457fde73ad0da47bccfc34a7d97a79fa0 | |
| parent | 8d4bb2231d45faaeaf14fb4bcd9587ba06461573 (diff) | |
| parent | eceb6331fe91e070852c0aec1022e6f9d162623f (diff) | |
| download | chef-9dfd221f7de33d31e9f345de82cd90d963304a8f.tar.gz | |
Merge pull request #5590 from chef/adamleff/use-chef-jsoncompat
Update Data Collector to use Chef::JSONCompat
| -rw-r--r-- | lib/chef/data_collector/messages.rb | 1 | ||||
| -rw-r--r-- | lib/chef/data_collector/messages/helpers.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/data_collector/messages.rb b/lib/chef/data_collector/messages.rb index e0dfd6cb67..f63242f85e 100644 --- a/lib/chef/data_collector/messages.rb +++ b/lib/chef/data_collector/messages.rb @@ -18,7 +18,6 @@ # limitations under the License. # -require "json" require "securerandom" require_relative "messages/helpers" diff --git a/lib/chef/data_collector/messages/helpers.rb b/lib/chef/data_collector/messages/helpers.rb index c0c700f847..d257b74893 100644 --- a/lib/chef/data_collector/messages/helpers.rb +++ b/lib/chef/data_collector/messages/helpers.rb @@ -142,14 +142,14 @@ class Chef # @return [Hash] DataCollector metadata for this node # def metadata - JSON.load(Chef::FileCache.load(metadata_filename)) + Chef::JSONCompat.parse(Chef::FileCache.load(metadata_filename)) rescue Chef::Exceptions::FileNotFound {} end def update_metadata(key, value) updated_metadata = metadata.tap { |x| x[key] = value } - Chef::FileCache.store(metadata_filename, updated_metadata.to_json, 0644) + Chef::FileCache.store(metadata_filename, Chef::JSONCompat.to_json(updated_metadata), 0644) end def metadata_filename |