cf_light_api 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6171776702205a88ec76125790efdcd5d2eac90b
-  data.tar.gz: 54d28ca42d4d29077920fedd93fec0f8e0b1d28e
+  metadata.gz: 417316fd53dc02ae75d5173f4476810f1d859e20
+  data.tar.gz: 2352be1e3ef38ca27cfe76ce335d8da94f242976
 SHA512:
-  metadata.gz: db84dbc5f76f63ad96823bb823c2b23549e8943e1e72315b603fccb9b65783566d2082be1d0907d76f6d9bc11e5a8694f34ed4255699656b47293a6efa1237f4
-  data.tar.gz: ae1ad0da601d7365a393ce04d4263a25c42220f2ccea6329dcd1940bdc8e9bc86a1ef9185be8d9e47b038f15cf16dc178181e545e1726a936da552150046f474
+  metadata.gz: e140e367cfe2ca04c18fca383102e80fd26c54255da38477703157dd360ad444d58401b138bdb3150c0719b87b0cac7247fd1bd02e8cdbdaef4b645daf19809f
+  data.tar.gz: 2e253d06021d0b874d5d150d2e76d2b775b11ec9eef3cf3d0de38aa05527f62035a12c106af07e1a1fa5a40558f61b18df7f92a6a4be02f425519a63008fb643

data/lib/cf_light_api/worker.rb

@@ -8,34 +8,61 @@ require 'rufus-scheduler'
 end
 
 scheduler = Rufus::Scheduler.new
-scheduler.every '5m', :first_in => '5s', :overlap => false do
+scheduler.every '5m', :first_in => '5s', :overlap => false, :timeout => '15m' do
+  begin
+    if locked?
+      puts "[cf_light_api:worker] Data update is already running in another worker, skipping..."
+      next
+    end
 
-  puts "[cf_light_api:worker] Updating data..."
+    lock
 
-  cf_client = get_client()
+    puts "[cf_light_api:worker] Updating data..."
 
-  org_data = []
-  app_data = []
-  cf_client.organizations.each do |org|
-    # The CFoundry client returns memory_limit in MB, so we need to normalise to Bytes to match the Apps.
+    cf_client = get_client()
 
-    org_data << {
-      :name => org.name,
-      :quota => {
-        :total_services => org.quota_definition.total_services,
-        :memory_limit   => org.quota_definition.memory_limit * 1024 * 1024
+    org_data = []
+    app_data = []
+    cf_client.organizations.each do |org|
+      # The CFoundry client returns memory_limit in MB, so we need to normalise to Bytes to match the Apps.
+      org_data << {
+        :name => org.name,
+        :quota => {
+          :total_services => org.quota_definition.total_services,
+          :memory_limit   => org.quota_definition.memory_limit * 1024 * 1024
+        }
       }
-    }
 
-    org.spaces.each do |space|
-      space.apps.each do |app|
-        app_data << format_app_data(app, org.name, space.name)
+      org.spaces.each do |space|
+        puts "processing space #{space.name}..."
+        space.apps.each do |app|
+          puts "processing app #{app.name}..."
+          app_data << format_app_data(app, org.name, space.name)
+        end
       end
     end
+
+    unlock
+
+    put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:orgs", org_data
+    put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:apps", app_data
+
+  rescue Rufus::Scheduler::TimeoutError
+    puts '[cf_light_api:worker] Data update took too long and was aborted...'
   end
-  put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:orgs", org_data
-  put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:apps", app_data
+end
+
+def locked?
+  REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:lock") ? true : false
+end
+
+def lock
+  REDIS.set "#{ENV['REDIS_KEY_PREFIX']}:lock", true
+  REDIS.expire "#{ENV['REDIS_KEY_PREFIX']}:lock", 900
+end
 
+def unlock
+  REDIS.del "#{ENV['REDIS_KEY_PREFIX']}:lock"
 end
 
 def get_client(cf_api=ENV['CF_API'], cf_user=ENV['CF_USER'], cf_password=ENV['CF_PASSWORD'])
@@ -57,9 +84,9 @@ def format_app_data(app, org_name, space_name)
   additional_data = {}
   begin
     additional_data = {
-      :running   => app.running?,
-      :instances => app.running? ? app.stats.map{|key, value| value} : [],
-      :error     => nil
+     :running   => app.running?,
+     :instances => app.running? ? app.stats.map{|key, value| value} : [],
+     :error     => nil
     }
   rescue => e
     puts "[cf_light_api:worker] #{org_name} #{space_name}: '#{app.name}'' error: #{e.message}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -78,7 +78,7 @@ files:
 - ./lib/cf_light_api/redis.rb
 - ./lib/cf_light_api/worker.rb
 - bin/cf_light_api
-homepage: http://springerpe.github.io
+homepage: https://github.com/springerpe/cf-light-api
 licenses:
 - MIT
 metadata: {}