cf_light_api 2.5.1 → 2.6.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18df9e343201fa390b2e742b91d088e41d78b922
-  data.tar.gz: 3312d769e6a5fec35b40e3cd1753823c17119205
+  metadata.gz: 0aa34192c2cb28dd5d9264bf8a9f20dbc4c11f0e
+  data.tar.gz: d3cbeddf6a787d949749485c9a9a78d61a05b467
 SHA512:
-  metadata.gz: fd5a3218fb2a0e54962c396a65a56f73738ad8b897742375189b02ae13166f5e52468e425bd0ae50fb88afef8b1ae52980755a19120960e7c7556b7e18b8aef8
-  data.tar.gz: e8c6a23ca2bd1127970a0d11a7adc31ee5a49c5e09e5b79aaf26866a6755438e2c59a42be227f948b41d43e4eeabac4dac2b007daf5ede9496bda2a2b5e39789
+  metadata.gz: ddd3c48ecdb5ce722b349d528fe886399bf30fa370560ce84c0f0cadcc4e116d62c2afb099e861f1aa8d0bf3fe8a54e11d19f52eb629f001198bccb4285bf928
+  data.tar.gz: fc3b794eff7f955015c6f51991ed1d7b013fcbe399b37f895b3ed350980b5414cf57c61e28d16ed930aab7a629ced1be09edfc04e2ddb132ba1484ed104fe45e

data/lib/cf_light_api/worker.rb

@@ -5,6 +5,7 @@ require 'redlock'
 require 'logger'
 require 'graphite-api'
 require 'date'
+require 'parallel'
 
 class CFLightAPIWorker
   if ENV['NEW_RELIC_LICENSE_KEY']
@@ -42,11 +43,14 @@ class CFLightAPIWorker
     update_interval = (ENV['UPDATE_INTERVAL'] || '5m').to_s # If you change the default '5m' here, also remember to change the default age validity in sinatra/cf_light_api.rb:31
     update_timeout  = (ENV['UPDATE_TIMEOUT']  || '5m').to_s
 
+    @update_threads  = (ENV['UPDATE_THREADS'] || 1).to_i
+
     @lock_manager = Redlock::Client.new([ENV['REDIS_URI']])
     @scheduler    = Rufus::Scheduler.new
 
-    @logger.info "Update interval: '#{@update_interval}'"
-    @logger.info "Update timeout:  '#{@update_timeout}'"
+    @logger.info "Update interval: '#{update_interval}'"
+    @logger.info "Update timeout:  '#{update_timeout}'"
+    @logger.info "Update threads:  '#{@update_threads}'"
 
     if ENV['GRAPHITE_HOST'] and ENV['GRAPHITE_PORT']
       @logger.info "Graphite server: #{ENV['GRAPHITE_HOST']}:#{ENV['GRAPHITE_PORT']}"
@@ -119,6 +123,12 @@ class CFLightAPIWorker
     end
   end
 
+  def send_cf_light_api_update_time_to_graphite seconds
+    graphite_key = "cf_light_api.#{ENV['CF_ENV_NAME']}.update_duration"
+    @logger.info "Exporting CF Light API update time to Graphite, path '#{graphite_key}'=>'#{seconds.round}'"
+    @graphite.metrics "#{graphite_base}" => seconds.round
+  end
+
   def put_in_redis(key, data)
     REDIS.set key, data.to_json
   end
@@ -196,7 +206,7 @@ class CFLightAPIWorker
             }
           end
 
-          formatted_apps = @apps.map do |app|
+          formatted_apps = Parallel.map(@apps, :in_threads => @update_threads) do |app|
             # TODO: This is a bit repetative, could maybe improve?
             space  = @spaces.find{|a_space| a_space['metadata']['guid'] == app['entity']['space_guid']}
             org    = @orgs.find{|an_org|     an_org['metadata']['guid'] == space['entity']['organization_guid']}
@@ -247,7 +257,9 @@ class CFLightAPIWorker
                :error     => nil
               }
 
-            rescue => e
+            rescue Rufus::Scheduler::TimeoutError => e
+              raise e
+            rescue StandardError => e
               # Most exceptions here will be caused by the app or one of the instances being in a non-standard state,
               # 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.
@@ -268,7 +280,10 @@ class CFLightAPIWorker
           put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:apps", formatted_apps
           put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:last_updated", {:last_updated => Time.now}
 
-          @logger.info "Update completed in #{format_duration(Time.now.to_f - start_time.to_f)}..."
+          elapsed_seconds = Time.now.to_f - start_time.to_f
+          @logger.info "Update completed in #{format_duration(elapsed_seconds)}..."
+          send_cf_light_api_update_time_to_graphite(elapsed_seconds) if @graphite
+
           @lock_manager.unlock(lock)
           @cf_client.logout
         else
@@ -277,6 +292,7 @@ class CFLightAPIWorker
       end
     rescue Rufus::Scheduler::TimeoutError
       @logger.info 'Data update took too long and was aborted, waiting for the lock to expire before trying again...'
+      send_cf_light_api_update_time_to_graphite(0) if @graphite
       @cf_client.logout
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0.pre1
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.17.1
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 description: A super lightweight API for reading App and Org data from CloudFoundry,
   cached in Redis.
 email: ''
@@ -135,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1