resqued 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce7631acfa66d7a6304040677347a590e4c8b228
-  data.tar.gz: 75ef7fb35ce15af4c6a822923ec87dafb045e459
+  metadata.gz: 67705e27820d6fe8873c3f5956496b0663f86967
+  data.tar.gz: 14e287bc2245039f2a95cfadd93687b0bf93f1a5
 SHA512:
-  metadata.gz: bb0b962f81017fd01923398777f08eea1d6de730dbe497aa5771e196eb4debb3cea73a2b24954e0f17ac49950a5bc600be3994d343303f54df9792dfa813afc5
-  data.tar.gz: 8c3a8685eb36b6f34ea2fcaf5d1376c16e08425e23216a6c630aad8dc1d229cc6d55555d3dd643db1f92e780fe1ddfa2e1fa67ca71868c4cb81968ddb86ad234
+  metadata.gz: d0025656e2d27f34ff858b738678dd1ddb767b3ccf6bf44051baf8d70a9ae226b364f81ec8489f4e404e659141b28caadee32302194064c8c4e13e44d98b372b
+  data.tar.gz: 71b5360eee39da10fb65713cf33b4e1fdd60792a1099eec76aa9c098602dccd8dd624b11f97108cfd2df8491c81d42e16a08627aad355296c05d321e0d7e106e

data/CHANGES.md

@@ -1,5 +1,10 @@
 Starting with version 0.6.1, resqued uses semantic versioning to indicate incompatibilities between the master process, listener process, and configuration.
 
+v0.7.11
+-------
+
+* Show worker count in more proclines. (#32)
+
 v0.7.10
 -------
 

data/docs/processes.md

@@ -13,7 +13,7 @@ When the workers are idle:
 
 ```
 -+= 77038 burke resqued master [gen 1] [1 running] config/resqued.rb
- \-+- 77208 burke resqued listener 1 [running] config/resqued.rb
+ \-+- 77208 burke resqued listener #1 6/6/6 [running] config/resqued.rb
    |--- 77492 burke resque-1.24.1: Waiting for import_high
    |--- 77493 burke resque-1.24.1: Waiting for import_high
    |--- 77494 burke resque-1.24.1: Waiting for important,import_low
@@ -26,7 +26,7 @@ When the workers are working:
 
 ```
 -+= 77038 burke resqued master [gen 1] [1 running] config/resqued.rb
- \-+- 51166 burke resqued listener 1 [running] config/resqued.rb
+ \-+- 51166 burke resqued listener #1 6/6/6 [running] config/resqued.rb
    |-+- 51638 burke resque-1.24.1: Forked 78947 at 1377103813
    | \--- 78947 burke SlowJob::ImportHigh 23 seconds remaining...
    |-+- 51639 burke resque-1.24.1: Forked 78948 at 1377103813
@@ -45,7 +45,7 @@ During restart, there should be no more workers than the configuration specifies
 
 ```
 -+= 51121 burke resqued master [gen 2] [2 running] config/resqued.rb
- |-+- 51166 burke resqued listener 1 [shutdown] config/resqued.rb
+ |-+- 51166 burke resqued listener #1 4/4/6 [shutdown] config/resqued.rb
  | |-+- 51638 burke resque-1.24.1: Forked 78947 at 1377103813
  | | \--- 78947 burke SlowJob::ImportHigh 23 seconds remaining...
  | |-+- 51639 burke resque-1.24.1: Forked 78948 at 1377103813
@@ -54,7 +54,7 @@ During restart, there should be no more workers than the configuration specifies
  | | \--- 78950 burke SlowJob::Normal 4 seconds remaining...
  | \-+- 51643 burke resque-1.24.1: Forked 78949 at 1377103813
  |   \--- 78949 burke SlowJob::Normal 4 seconds remaining...
- \-+- 79528 burke resqued listener 2 [running] config/resqued.rb
+ \-+- 79528 burke resqued listener #2 2/6/6 [running] config/resqued.rb
    |-+- 79907 burke resque-1.24.1: Forked 79920 at 1377103819
    | \--- 79920 burke SlowJob::ImportLow 29 seconds remaining...
    \-+- 79908 burke resque-1.24.1: Forked 79921 at 1377103819

data/lib/resqued/listener.rb

@@ -96,6 +96,7 @@ module Resqued
         reap_workers(Process::WNOHANG)
         check_for_expired_workers
         start_idle_workers
+        write_procline('running')
         case signal = SIGNAL_QUEUE.shift
         when nil
           yawn
@@ -141,6 +142,11 @@ module Resqued
       partition_workers.last
     end
 
+    # Private: just the workers running as children of this listener.
+    def my_workers
+      workers.select { |worker| worker.running_here? }
+    end
+
     # Private: Split the workers into [not-running, running]
     def partition_workers
       workers.partition { |worker| worker.idle? }
@@ -233,10 +239,10 @@ module Resqued
     # Private.
     def write_procline(status)
       procline = "#{procline_version} listener"
-      procline << " #{@listener_id}" if @listener_id
+      procline << " \##{@listener_id}" if @listener_id
+      procline << " #{my_workers.size}/#{running_workers.size}/#{workers.size}" if workers
       procline << " [#{info.app_version}]" if info.app_version
       procline << " [#{status}]"
-      procline << " [#{running_workers.size} workers]" if status == 'shutdown'
       procline << " #{@config_paths.join(' ')}"
       $0 = procline
     end

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.7.10'
+  VERSION = '0.7.11'
 end

data/lib/resqued/worker.rb

@@ -27,6 +27,11 @@ module Resqued
       pid.nil?
     end
 
+    # Public: True if this worker is running in this process.
+    def running_here?
+      !idle? && @self_started
+    end
+
     # Public: A string that compares if this worker is equivalent to a worker in another Resqued::Listener.
     def queue_key
       queues.sort.join(';')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio