cf_light_api 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c6c07057db7bcc94578dac1cd86df31f4dd8668
-  data.tar.gz: 6ec5eefd992411cd96c19ddcabe281cc6b378b2e
+  metadata.gz: f654aa8f8b0ea4acd474136ea1d9bf85495bd663
+  data.tar.gz: 320ff81e1b886b5fb1224278a16accb08436ce24
 SHA512:
-  metadata.gz: 4fbba9347922daa7b5b9170789e5a640155e7b2fbe56ad57d9e0b1c74a1666abe9726d561495824da485992537499833725cca8f4570412c90ee0abb28a44a4c
-  data.tar.gz: ebb94d31890dc8e10dbe62210ad2ccac24c9aa52ab269ad5d5bd8e470c7575f5b99ce0109188981982d0d98331fc8bfbbb3e5245b6e9323d67d873460b80856b
+  metadata.gz: 02e3b510c6f2b63c995069310113aaffb0cd765ef14e8079a3041e884c3ddd7dcc5e9af6a2d9152363a5b48f3e56650b324a9fe61f5288eb383c46441cdacb52
+  data.tar.gz: 30cfff827cf36b2da621d8a43a1c9f650a0292f5c73da3d8b927413b8b1713193c5478e2363920bdfbe15b78443da6a702b73252edcc60dd6dbbbcca6396e353

data/lib/cf_light_api/worker.rb

@@ -15,18 +15,25 @@ end
   next
 end
 
-PARALLEL_MAPS = (ENV['PARALLEL_MAPS'] || 4).to_i
+PARALLEL_MAPS   = (ENV['PARALLEL_MAPS']   || 4   ).to_i
+UPDATE_INTERVAL = (ENV['UPDATE_INTERVAL'] || '5m').to_s
+UPDATE_TIMEOUT  = (ENV['UPDATE_TIMEOUT']  || '5m').to_s
 
 lock_manager = Redlock::Client.new([ENV['REDIS_URI']])
 scheduler = Rufus::Scheduler.new
-scheduler.every '5m', :first_in => '5s', :overlap => false, :timeout => '5m' do
+
+@logger.info "Parallel maps:   '#{PARALLEL_MAPS}'"
+@logger.info "Update interval: '#{UPDATE_INTERVAL}'"
+@logger.info "Update timeout:  '#{UPDATE_TIMEOUT}'"
+
+scheduler.every UPDATE_INTERVAL, :first_in => '5s', :overlap => false, :timeout => UPDATE_TIMEOUT do
   cf_client = nil
   begin
     lock_manager.lock("#{ENV['REDIS_KEY_PREFIX']}:lock", 5*60*1000) do |lock|
       if lock
         start_time = Time.now
 
-        @logger.info "Updating data in parallel (#{PARALLEL_MAPS})..."
+        @logger.info "Updating data in parallel..."
 
         cf_client = get_client()
 
@@ -35,17 +42,18 @@ scheduler.every '5m', :first_in => '5s', :overlap => false, :timeout => '5m' do
 
         put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:orgs", org_data
         put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:apps", app_data
-        put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:last_updated", Time.now
+        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)}..."
         lock_manager.unlock(lock)
         cf_client.logout
       else
-        @logger.info "Update already running in another thread!"
+        @logger.info "Update already running in another instance!"
       end
     end
   rescue Rufus::Scheduler::TimeoutError
     @logger.info 'Data update took too long and was aborted...'
+    lock_manager.unlock(lock)
     cf_client.logout
   end
 end

data/lib/sinatra/cf_light_api.rb

@@ -20,6 +20,11 @@ module Sinatra
         content_type :json
         REDIS.get "#{ENV['REDIS_KEY_PREFIX']}:orgs"
       end
+
+      app.get '/v1/last_updated' do
+        content_type :json
+        REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:last_updated")
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry