Add exception handling for JSON::ParserError

sous-chefs · Nov 16, 2017 · b93fb0d · b93fb0d
1 parent f94e38a
commit b93fb0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/libraries/organization_api.rb b/libraries/organization_api.rb
@@ -199,7 +199,11 @@ def _do_request(grafana_options, payload=nil)
         success: grafana_options[:success_msg],
         unknown_code: grafana_options[:unknown_code_msg]
       )
-      JSON.parse(response.body)
+      begin
+        JSON.parse(response.body)
+      rescue JSON::ParserError
+        nil
+      end
     rescue BackendError
       nil
     end

diff --git a/resources/organization.rb b/resources/organization.rb
@@ -1,7 +1,7 @@
 actions :create, :update, :delete
 default_action :create
 
-state_attrs :organization_name
+state_attrs :name
 
 # Grafana options
 attribute :host, kind_of: String, default: 'localhost'