right_chimp 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5ebf63eb4e362b8ca04cd63a9024783e4fe2da4
-  data.tar.gz: 224050b386b01bfa51502c518a30236cc8abfe5d
+  metadata.gz: 83fd9994cdfae0dd10d1122dc7e645abc9923632
+  data.tar.gz: 243da13a5197c1504d1ed2825be68ef30dbdce1f
 SHA512:
-  metadata.gz: e2cb89a0e116334d4489c5216096992c719236e30c0f518e5d4e22a175250a29dde39baa13abd7c95759c27c7959d86c1653abb0f65800dfaf1b09c31ac63b54
-  data.tar.gz: eff590fd49f325549033f32d1f9c928734e0bff6f9b95e18fe58a6821327bd0fa44eec1f96fe10f6adaf348bda12a6b3a5c5d4814d50dd9b8b94143067310fad
+  metadata.gz: 658cbfc45bb6fcb49c64c46e2cb1517065a2cbdb5e82b2e09349299f653c65f2f31d99d3426dbd3c936c8c665f980f5a7435314e363ac64a124dceca2f320e92
+  data.tar.gz: a55a1b56dc09f4fec0409b80ab779828f6f530048abe93435700c29df23b4d8d15fac83628e7c133be4581632cdc4fc147efcfb91670d6ccb580fd7f68b0fc28

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.5)
+    right_chimp (2.1.8)
       highline (~> 1.7.2)
       nokogiri (~> 1.5.9)
       progressbar (~> 0.11.0)
@@ -12,14 +12,14 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    highline (1.7.3)
+    highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     json (1.8.3)
     mime-types (1.25.1)
-    netrc (0.10.3)
+    netrc (0.11.0)
     nokogiri (1.5.11)
     progressbar (0.11.0)
     rake (10.4.2)
@@ -27,7 +27,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    right_api_client (1.5.28)
+    right_api_client (1.6.1)
       json (~> 1.0)
       mime-types (~> 1.0)
       rest-client (~> 1.6)

data/lib/right_chimp/daemon/ChimpDaemon.rb

@@ -532,7 +532,7 @@ module Chimp
         #
         # Check if we are asked for stats
         #
-        if req.request_uri.path =~ /stats/
+        if req.request_uri.path =~ /stats$/
           queue = ChimpQueue.instance
           stats = ""
           stats << "running: #{queue.get_jobs_by_status(:running).size} / "
@@ -547,6 +547,47 @@ module Chimp
           raise WEBrick::HTTPStatus::OK
         end
 
+        if req.request_uri.path =~ /stats\.json$/
+          # instance the queue
+          queue = ChimpQueue.instance
+
+          stats_hash = {"running" => queue.get_jobs_by_status(:running).size,
+                        "waiting" => queue.get_jobs_by_status(:waiting).size,
+                        "failed" => queue.get_jobs_by_status(:error).size,
+                        "done" => queue.get_jobs_by_status(:done).size,
+                        "processing" => ChimpDaemon.instance.proc_counter.to_s,
+                        "holding" => queue.get_jobs_by_status(:holding).size
+                      }
+
+          resp.body = JSON.generate(stats_hash)
+
+          raise WEBrick::HTTPStatus::OK
+        end
+
+        if req.request_uri.path =~ /jobs\.json$/
+          #instance the queue
+          queue = ChimpQueue.instance
+
+          job_types = [ :running, :error, :done ]
+
+          jobs = {}
+
+          job_types.each do |type|
+            jobs[type] = queue.get_jobs_by_status(type).map do |job|
+              { :id => job.job_id,
+                :server => job.server.params["name"],
+                :name => job.exec.params["right_script"]["name"],
+                :error_message => job.error.nil? ? "" : job.error.message
+              }
+            end
+          end
+
+          resp.body = jobs.to_json
+
+          raise WEBrick::HTTPStatus::OK
+        end
+
+
         #
         # Check for static CSS files and serve them
         #

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.7"
+  VERSION = "2.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake