right_chimp 2.1.27 → 2.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e4535300fdf9ef9315f023169d64859ff2a4322
-  data.tar.gz: fa6fdfcbe564368ad7cf99389659b3f1837938d0
+  metadata.gz: f4500754260b1df0b21af07eed9bd20591e227d3
+  data.tar.gz: ae09d843fb8c1323b04662ea20b46ab5aee756fc
 SHA512:
-  metadata.gz: 3da7b50ce4eb42d35552dfe9308d05fb7b9e25ea202ebcc54eba48a6ff99790d832e327c8da2053b54981552ad84715af7404009cb3b1cea88d0fa5afa3ad235
-  data.tar.gz: ac89ab3a8557f4a1daa7c9cd38eb902e2e99df53b207e136627eff976dd8e2509b59fb39a1fae437b908fabb6d190fd6bf2bc300347a8fb1209612e56a517c00
+  metadata.gz: 3912f54d07ee75639188a9280400f64ed7810404972978e0db0af023943631d76133abbba2d78db20e229f9e5fef48e66606b98477b66f81c4401df27d3be48c
+  data.tar.gz: 6e7c5de7246ce757b170933c986d4c1500a515918af04dd5a56a07d377a21d68a82112170bebd9d5cecaa7515b430c1e4dd310aa2cc0c1bb64c4c4b0cb2ce0e7

data/CHANGES

@@ -1,3 +1,7 @@
+Version 2.1.28
+--------------
+* Bugfix: Do not attempt to decrease the processing counter when handling a retry.
+
 Version 2.1.26
 --------------
 * Feature: Implemented the delay attribute for work_items of the Executor type, so they can be used when

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.27)
+    right_chimp (2.1.28)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)

data/lib/right_chimp/queue/QueueWorker.rb

@@ -38,20 +38,29 @@ module Chimp
                 if ChimpDaemon.instance.queue.processing[group][job_uuid.to_sym] == 0
                   Log.debug 'Completed processing task ' + job_uuid.to_s
                   Log.debug 'Deleting ' + job_uuid.to_s
+
                   ChimpDaemon.instance.queue.processing[group].delete(job_uuid.to_sym)
+
                   Log.debug ChimpDaemon.instance.queue.processing.inspect
+
+                  ChimpDaemon.instance.proc_counter -= 1
                 else
-                  Log.debug 'Decreasing processing counter (' + ChimpDaemon.instance.proc_counter.to_s +
-                            ') for [' + job_uuid.to_s + '] group: ' + group.to_s
+                  if ChimpDaemon.instance.queue.processing[group][job_uuid.to_sym].nil?
+                    Log.debug 'Job group was already deleted, no counter to decrease.'
+                  else
+                    Log.debug 'Decreasing processing counter (' + ChimpDaemon.instance.proc_counter.to_s +
+                              ') for [' + job_uuid.to_s + '] group: ' + group.to_s
+
+                    ChimpDaemon.instance.queue.processing[group][job_uuid.to_sym] -= 1
 
-                  ChimpDaemon.instance.queue.processing[group][job_uuid.to_sym] -= 1
+                    Log.debug 'Processing counter now (' + ChimpDaemon.instance.proc_counter.to_s +
+                              ') for [' + job_uuid.to_s + '] group: ' + group.to_s
+                    Log.debug ChimpDaemon.instance.queue.processing[group].inspect
+                    Log.debug 'Still counting down for ' + job_uuid.to_s
 
-                  Log.debug 'Processing counter now (' + ChimpDaemon.instance.proc_counter.to_s +
-                            ') for [' + job_uuid.to_s + '] group: ' + group.to_s
-                  Log.debug ChimpDaemon.instance.queue.processing[group].inspect
-                  Log.debug 'Still counting down for ' + job_uuid.to_s
+                    ChimpDaemon.instance.proc_counter -= 1
+                  end
                 end
-                ChimpDaemon.instance.proc_counter -= 1
               end
             end
 

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.27"
+  VERSION = "2.1.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.1.27
+  version: 2.1.28
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake