cf_light_api 2.6.0.pre2 → 2.6.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06b2d8bbee9ce02ce4e63d45779b4e13aae119c1
-  data.tar.gz: 546c062c1856166a97833c57a48e8aca14a96b0e
+  metadata.gz: 98cdbae3a37af7f2695450f99b73a07aaa28c478
+  data.tar.gz: b9fa101e8523f7a7d28c2f320ce89474cbd55f83
 SHA512:
-  metadata.gz: faa6ae8ccaee6f7d212748542d7f7d0033bdfc2b322a6a9f0d2363fcaf1fa2a5377be2d72488eb2a4a2e5ed9c4b313ddf534d7d61b3427de9fff2a7df5be1d3c
-  data.tar.gz: 1912ca0b9733f6ab8bf9f3581d1c4d6908675e2d9de29107d324cff939eb799282dc5541449439e888a7e347ea03f7f61fa06f1e57fe90ca399b5a492afbbe31
+  metadata.gz: 20e105700cdff0123f2471db9d34f13aaaef84613186ad9fb5095fbcf91df4023ea79fab2848661f7b2a47edb6d263d32d9c1c71ed709de56519f68f0d1730e1
+  data.tar.gz: 6c5d2ab591c958a40bb8430e9a25db23ed420f43946b4d0fb06169cc6ed013d8fd2834832f34836615cc390fa9598c31bcedcdce6e022e4f6b825c569ed097ca

data/lib/cf_light_api/worker.rb

@@ -74,7 +74,18 @@ class CFLightAPIWorker
     @logger.info "Making #{method} request for #{path}..."
 
     resources = []
-    response = JSON.parse(@cf_client.base.rest_client.request(method, path)[1][:body])
+    options = {:accept => :json}
+    response = @cf_client.base.rest_client.request(method, path, options)[1][:body]
+
+    begin
+      response = JSON.parse(response)
+    rescue Rufus::Scheduler::TimeoutError => e
+      raise e
+    rescue StandardError => e
+      @logger.info "Error parsing JSON response from #{method} request for #{path}: #{e.message}"
+      @logger.error e.backtrace
+      raise "Invalid JSON response from CF for #{method} #{path}"
+    end
 
     # Some endpoints return a 'resources' array, others are flat, depending on the path.
     if response['resources']
@@ -146,8 +157,15 @@ class CFLightAPIWorker
       host   = route['entity']['host']
       path   = route['entity']['path']
 
-      domain = @domains.find{|a_domain| a_domain['metadata']['guid'] == route['entity']['domain_guid']}
-      domain = domain['entity']['name']
+      domain = ''
+      begin
+        domain = @domains.find{|a_domain| a_domain['metadata']['guid'] == route['entity']['domain_guid']}
+        domain = domain['entity']['name']
+      rescue Rufus::Scheduler::TimeoutError => e
+        raise e
+      rescue StandardError => e
+        raise "Unable to determine domain for route #{route['metadata']['url']}"
+      end
 
       "#{host}.#{domain}#{path}"
     end
@@ -264,6 +282,7 @@ class CFLightAPIWorker
               # for example, trying to query an app which was present when the worker began updating, but was stopped
               # before we reached this section, so we just catch all exceptions, log the reason and move on.
               @logger.info "  #{org['entity']['name']} #{space['entity']['name']}: '#{app['entity']['name']}' error: #{e.message}"
+              @logger.error e.backtrace
               additional_data = {
                 :running   => 'error',
                 :instances => [],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 2.6.0.pre2
+  version: 2.6.0.pre3
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry