cf_light_api 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2b445bb4b226594c287865ab11856d26ead5ef2
-  data.tar.gz: c35504e2c5c7650b80d8646370f199a993f9f9b8
+  metadata.gz: 3cff6a981946b0f933ecf05e61e1b27d710eb286
+  data.tar.gz: 53dec5c12b6a40f5959cb8f419a3e2877f95a137
 SHA512:
-  metadata.gz: c5abe583323af2e9bf05da0413d48cb0fe5e637fd71194a8b860a83f643a8676aa938f4099948a61c81edcc53959203a399e95aaf9fffa1de7a694f56ca0db0d
-  data.tar.gz: e65c0b5f048454d2551c534709c6f85be6b4dcb68534fffe1cf2c28708b894e9e54872c5447d7c8398c30cfaf83f4088497dbe213aa0a62bab0a56efa6e2ef6e
+  metadata.gz: 7ee0a4a4f89bef83e18792ad2ff1d9b0967599b6eea911a56a4b91dea9014c9cff9eeb5953965583b61f732fb2647a5c1d8d27e6701da654f6bc6bfaf13d9c0e
+  data.tar.gz: 398b8eb74e2e2888aab12197a2eb66b1dcf218de3f5053b08c79181da1cffdbd67223e8e9e103a77db30ddf2db13fdfd98b0d65fcbeb2b65954d95c82f6daf81

data/lib/cf_light_api/worker.rb

@@ -19,7 +19,7 @@ end
 end
 
 PARALLEL_MAPS   = (ENV['PARALLEL_MAPS']   || 4   ).to_i
-UPDATE_INTERVAL = (ENV['UPDATE_INTERVAL'] || '5m').to_s
+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
 
 lock_manager = Redlock::Client.new([ENV['REDIS_URI']])
@@ -58,8 +58,7 @@ scheduler.every UPDATE_INTERVAL, :first_in => '5s', :overlap => false, :timeout
       end
     end
   rescue Rufus::Scheduler::TimeoutError
-    @logger.info 'Data update took too long and was aborted...'
-    lock_manager.unlock(lock)
+    @logger.info 'Data update took too long and was aborted, waiting for the lock to expire before trying again...'
     cf_client.logout
   end
 end

data/lib/sinatra/cf_light_api.rb

@@ -23,21 +23,14 @@ module Sinatra
 
       app.get '/v1/last_updated' do
         content_type :json
-        REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:last_updated")
-      end
+        updated_json = REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:last_updated")
 
-      app.get '/internal/status' do
-        content_type :json
-        updated = REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:last_updated")
-        last_updated = JSON.parse(updated)
-        updated_datetime = DateTime.parse(last_updated["last_updated"])
-        seconds_since_update = ((DateTime.now - updated_datetime) * 24 * 60 * 60).to_i
-        if seconds_since_update >= 300
-          status 503
-        end
-        "{}"
-      end
+        last_updated         = DateTime.parse JSON.parse(updated_json)["last_updated"]
+        seconds_since_update = ((DateTime.now - last_updated) * 24 * 60 * 60).to_i
 
+        status 503 if seconds_since_update >= (ENV['DATA_AGE_VALIDITY'] || '600'.to_i)
+        return updated_json
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -116,9 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ./lib/sinatra/cf_light_api.rb
 - ./lib/cf_light_api/redis.rb
 - ./lib/cf_light_api/worker.rb
-- ./lib/sinatra/cf_light_api.rb
 - bin/cf_light_api
 homepage: https://github.com/springerpe/cf-light-api
 licenses:
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A super lightweight API for reading App and Org data from CloudFoundry, cached