right_chimp 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527c00b56adb583e1c1ee40c9504276197f2e633
-  data.tar.gz: 6627803d68014704c0bdc4d99eca8818e6416b1a
+  metadata.gz: 8af4200a6b909aada3f2301d06e987d35d2269fc
+  data.tar.gz: c0cedcfdf23e22c3f78a28ffc17effecf6dfa657
 SHA512:
-  metadata.gz: 4722c753c8f4e7b48922114417a0904000eb368802887acedc69b990094ed6b41c0d155bee89ea1b3065e6a3c4df57e05a1c888d4b844853caabc4f52ebb5983
-  data.tar.gz: 060c70d07165059dccd5ef98921db61659f0083f50cea41f73feb8990b0058211bbbd3b99f19112090ef46e246b51601b593470a4a73a372c460034aef3007d5
+  metadata.gz: 8ae8ebc03931a5e06759f997b6f8a563ff845bc7eea0ef8026b4fc52541eb4da58c3709bbd6d10ef8504adbd6be1e4a9be739b8931b4df07b71c3f9bf54dfb3c
+  data.tar.gz: 76f795bbf6f71e59490481eaab1d743a435405d0181124fb77273b9f112795cbc2524004e51bc3974475e7218c4eae8a1267ab7c90635ada3e660a7e381345ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.0.2)
+    right_chimp (2.1.2)
       highline (~> 1.7.2)
       nokogiri (~> 1.5.9)
       progressbar (~> 0.11.0)

data/lib/right_chimp/Chimp.rb

@@ -1062,6 +1062,7 @@ module Chimp
       Chimp.set_job_uuid(self.job_uuid)
 
       Log.debug "[#{Chimp.get_job_uuid}] Processing task"
+      # Add to our "processing" counter
 
       Log.debug "[#{Chimp.get_job_uuid}] Trying to get array_info" unless Chimp.failure
       get_array_info unless Chimp.failure
@@ -1075,6 +1076,11 @@ module Chimp
       Log.debug "[#{Chimp.get_job_uuid}] Trying to get executable_info" unless Chimp.failure
       get_executable_info unless Chimp.failure
 
+      # All elements of task have been processed
+      ChimpDaemon.instance.semaphore.synchronize do
+        ChimpDaemon.instance.proc_counter -= 1
+      end
+
       if Chimp.failure
 
         Log.error "##################################################"

data/lib/right_chimp/daemon/ChimpDaemon.rb

@@ -7,7 +7,8 @@
 module Chimp
   class ChimpDaemon
 
-    attr_accessor :verbose, :debug, :port, :concurrency, :delay, :retry_count, :dry_run, :logfile, :chimp_queue
+    attr_accessor :verbose, :debug, :port, :concurrency, :delay, :retry_count,
+                  :dry_run, :logfile, :chimp_queue, :proc_counter, :semaphore
     attr_reader :queue, :running
 
     include Singleton
@@ -23,6 +24,9 @@ module Chimp
       @running     = false
       @queue       = ChimpQueue.instance
       @chimp_queue = Queue.new
+      @semaphore   = Mutex.new
+
+      @proc_counter= 0
 
       #Connect to the API
       Connection.instance
@@ -402,6 +406,10 @@ module Chimp
         #  end
         if verb == 'process' or verb == 'add'
           ChimpDaemon.instance.chimp_queue.push payload
+          ChimpDaemon.instance.semaphore.synchronize do
+            ChimpDaemon.instance.proc_counter +=1 
+          end
+          Log.debug "Tasks in the processing queue: #{ChimpDaemon.instance.proc_counter.to_s}"
           id = 0
         elsif verb == 'update'
           puts "UPDATE"
@@ -521,6 +529,23 @@ module Chimp
           template_path = 'lib/right_chimp/templates'
         end
 
+        #
+        # Check if we are asked for stats
+        #
+        if req.request_uri.path =~ /stats/
+          queue = ChimpQueue.instance
+          stats = ""
+          stats << "running: #{queue.get_jobs_by_status(:running).size} / "
+          stats << "failed: #{queue.get_jobs_by_status(:error).size} / "
+          stats << "done: #{queue.get_jobs_by_status(:done).size} / "
+          stats << "processing: #{ChimpDaemon.instance.proc_counter.to_s} / "
+          stats << "\n"
+
+          resp.body = stats
+
+          raise WEBrick::HTTPStatus::OK
+        end
+
         #
         # Check for static CSS files and serve them
         #
@@ -554,6 +579,7 @@ module Chimp
           count_jobs_holding  = queue.get_jobs_by_status(:holding).size
           count_jobs_failed  = queue.get_jobs_by_status(:error).size
           count_jobs_done    = queue.get_jobs_by_status(:done).size
+          count_jobs_processing = queue.get_jobs_by_status(:processing).size
 
           resp.body = @template.result(binding)
           raise WEBrick::HTTPStatus::OK

data/lib/right_chimp/objects/ChimpObjects.rb

@@ -120,6 +120,7 @@ module Chimp
     def Connection.api16_call(query)
 
       Thread.current[:retry] = true
+      Thread.current[:response] = nil
       retries = 5
       attempts = 0
       sleep_for = 20
@@ -151,24 +152,21 @@ module Chimp
 
             Log.debug "[#{Chimp.get_job_uuid}] Attempt # #{attempts+1} at querying the API" unless attempts == 0
 
-            time = Benchmark.measure do
-              begin
-                Log.debug "[#{Chimp.get_job_uuid}] HTTP Making http request"
-                Thread.current[:response] = http.request(get)
-                Log.debug "[#{Chimp.get_job_uuid}] HTTP Request complete"
-                attempts += 1
-              rescue Exception => e
-                Log.error "[#{Chimp.get_job_uuid}] Exception when making the HTTP request"
-              end
+            Log.debug "[#{Chimp.get_job_uuid}] HTTP Making http request"
+            start_time = Time.now
+            Thread.current[:response] = http.request(get)
+            end_time = Time.now
+            total_time = end_time - start_time
 
-            end
+            Log.debug "[#{Chimp.get_job_uuid}] HTTP Request complete"
+            attempts += 1
 
-            Log.debug "[#{Chimp.get_job_uuid}] API Request time: #{time.real} seconds"
+            Log.debug "[#{Chimp.get_job_uuid}] API Request time: #{total_time} seconds"
             Log.debug "[#{Chimp.get_job_uuid}] API Query was: #{query}"
 
             # Validate API response
             Log.debug "[#{Chimp.get_job_uuid}] Validating..."
-             instances = validate_response(Thread.current[:response], query)
+            instances = validate_response(Thread.current[:response], query)
           else
             # We dont retry, exit the loop.
             Log.debug "[#{Chimp.get_job_uuid}] Not retrying, exiting the loop."
@@ -188,24 +186,21 @@ module Chimp
           raise "[#{Chimp.get_job_uuid}] Api call failed more than #{retries} times."
         end
 
+        if instances.nil?
+          Log.error "[#{Chimp.get_job_uuid}] instances is nil!"
+        else
+          Log.debug "[#{Chimp.get_job_uuid}] API matched #{instances.count} instances"
+        end
+
       rescue Exception => e
         Log.error "[#{Chimp.get_job_uuid}] #{e.message}"
         Log.error "[#{Chimp.get_job_uuid}] Catched exception on http request to the api, retrying"
 
-        # Failure to be set only on maximum retries
-        # Chimp.set_failure(true)
-
         instances = []
         attempts += 1
         retry
       end
 
-      Log.debug "[#{Chimp.get_job_uuid}] API matched #{instances.count} instances" unless instances.nil?
-
-	if instances.nil?
-		Log.error "[#{Chimp.get_job_uuid}] instances is nil!"
-	end
-
       return instances
     end
 

data/lib/right_chimp/templates/all_jobs.erb

@@ -47,6 +47,9 @@ SINCE 2012</p>
 </tr><tr>
   <td>Jobs completed:</td>
   <td><%= count_jobs_done %>
+</tr><tr>
+  <td>Jobs being processed:</td>
+  <td><%= ChimpDaemon.instance.proc_counter.to_s %>
 </tr>
 </table>
 
@@ -112,7 +115,7 @@ jobs.each do |j|
 
   status      = j.status
   id          = j.job_id
-  
+
   server_name = CGI::escapeHTML(j.server.params['nickname']) if j.server
 
   if j.exec
@@ -171,4 +174,3 @@ jobs.each do |j|
 </div>
 
 </body></html>
-

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.0"
+  VERSION = "2.1.2"
 end

data/lib/right_chimp.rb

@@ -18,9 +18,6 @@ require 'right_api_client'
 require 'rest-client'
 require 'logger'
 
-require "benchmark"
-
-
 module Chimp
   require 'right_chimp/version'
   require 'right_chimp/Chimp'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake