cf_light_api 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79c9dd7253511cebab13f81590277976b6c46b5
-  data.tar.gz: 0f24c83eaecddbcc14cf791551ddbf41d8e26b4f
+  metadata.gz: e3a2339a3ba1a090cc92e750dbf9c7989b65e6f2
+  data.tar.gz: 4aeafe0baf9434fbb864d0935ddb2c229bd13fc4
 SHA512:
-  metadata.gz: 46f5242f6978654e8068cdd77908956ae039df031856185adaa4ec0f1ad56e3ba8ef0050703addea0d26f77a135cbdcfd8dd4debc6cfc44f86e3a1a45e126d26
-  data.tar.gz: cefefdacff01ac70e6bc9c15f0cdc89ca577a50be27d6ba6b7cf53d821bea7476da74502c9da55f86bf9cd359bf285604d84c32a54f0cba43cd788e6ce8865fe
+  metadata.gz: 5938dc292f80b5e0c498bf1dbd7f031a3c413552cee9b860b54528a974edb85da0031c889213a5938e3eabfaba947f3adf8e463ce43af22050bd4829a23c8ee6
+  data.tar.gz: da3062575af4938552a00d1003f94c03d7e9f6c1c65c8c235ce4b788a3001d838ad4a56251c5d9021779a6eaffe8de74d3965f8f05842885b6a6cd619aa30897

data/bin/cf_light_api

@@ -8,4 +8,5 @@ require_relative '../lib/cf_light_api/worker.rb'
 require 'sinatra'
 require 'sinatra/cf_light_api'
 
+set :traps, false
 set :run, true

data/lib/cf_light_api/worker.rb

@@ -1,6 +1,7 @@
 require 'cfoundry'
 require 'json'
 require 'rufus-scheduler'
+require 'parallel'
 
 ['CF_API', 'CF_USER', 'CF_PASSWORD'].each do |env|
   puts "[cf_light_api:worker] Error: please set the '#{env}' environment variable." unless ENV[env]
@@ -24,22 +25,29 @@ scheduler.every '5m', :first_in => '5s', :overlap => false, :timeout => '15m' do
 
     org_data = []
     app_data = []
-    cf_client.organizations.each do |org|
+    org_data = Parallel.map( cf_client.organizations, :in_processes => 4) 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)
+    end.flatten
+
+    app_data = Parallel.map( cf_client.organizations, :in_processes => 4) do |org|
+      Parallel.map( org.spaces, :in_processes => 4) do |space|
+        Parallel.map( space.apps, :in_processes => 4) do |app|
+          begin
+            # It's possible for an app to have been terminated before this stage is reached.
+            format_app_data(app, org.name, space.name)
+          rescue CFoundry::AppNotFound
+            next
+          end
         end
       end
-    end
+    end.flatten
 
     unlock
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement