roundhouse-x 0.1.0 → 0.2.0

data/test/test_processor.rb

@@ -41,8 +41,8 @@ class TestProcessor < Roundhouse::Test
       @boss.expect(:async, actor, [])
       @processor.process(work(msg))
 
-      # After being finished, the q_id should be put back into the semaphore
-      queue_id = Roundhouse.redis { |conn| conn.lrange('semaphore', 0, 0).first }
+      # After being finished, the q_id should be put back into rotation
+      queue_id = Roundhouse.redis { |conn| conn.lrange(Roundhouse::Monitor::TURNTABLE, 0, 0).first }
       assert_equal '100', queue_id
 
       @boss.verify

data/web/assets/javascripts/dashboard.js

@@ -215,6 +215,11 @@ var updateStatsSummary = function(data) {
   $('ul.summary li.retries span.count').html(data.retries.numberWithDelimiter())
   $('ul.summary li.enqueued span.count').html(data.enqueued.numberWithDelimiter())
   $('ul.summary li.dead span.count').html(data.dead.numberWithDelimiter())
+  $('ul.summary li.in-rotation span.count').html(data.in_rotation.numberWithDelimiter())
+  $('ul.summary li.queues span.count').html(data.num_queues.numberWithDelimiter())
+  $('ul.summary li.empty-queues span.count').html(data.num_empty_queues.numberWithDelimiter())
+  $('ul.summary li.suspended-queues span.count').html(data.num_suspended_queues.numberWithDelimiter())
+  $('ul.summary li.avg-queue-len span.count').html(data.avg_queue_len.numberWithDelimiter())
 
 }
 

data/web/views/_summary.erb

@@ -37,4 +37,24 @@
       <span class="desc"><%= t('Dead') %></span>
     </a>
   </li>
+  <li class="in-rotation col-sm-1">
+      <span class="count"><%= number_with_delimiter(stats.in_rotation) %></span>
+      <span class="desc"><%= t('In Rotation') %></span>
+  </li>
+  <li class="queues col-sm-1">
+      <span class="count"><%= number_with_delimiter(stats.num_queues) %></span>
+      <span class="desc"><%= t('Queues') %></span>
+  </li>
+  <li class="empty-queues col-sm-1">
+      <span class="count"><%= number_with_delimiter(stats.num_empty_queues) %></span>
+      <span class="desc"><%= t('Empty') %></span>
+  </li>
+  <li class="suspended-queues col-sm-1">
+      <span class="count"><%= number_with_delimiter(stats.num_suspended_queues) %></span>
+      <span class="desc"><%= t('Suspended') %></span>
+  </li>
+  <li class="avg-queue-len col-sm-1">
+      <span class="count"><%= number_with_delimiter(stats.avg_queue_len) %></span>
+      <span class="desc"><%= t('Avg Queue Len') %></span>
+  </li>
 </ul>

data/web/views/busy.erb

@@ -32,8 +32,6 @@
             <span class="label label-info"><%= label %></span>
           <% end %>
           <br>
-          <b><%= "#{t('Queues')}: " %></b>
-          <%= process['queues'] * ", " %>
         </td>
         <td><%= relative_time(Time.at(process['started_at'])) %></td>
         <td><%= process['concurrency'] %></td>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roundhouse-x
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ho-Sheng Hsiao
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -99,6 +99,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: wolverine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +233,7 @@ files:
 - lib/roundhouse/rails.rb
 - lib/roundhouse/redis_connection.rb
 - lib/roundhouse/scheduled.rb
+- lib/roundhouse/script.rb
 - lib/roundhouse/testing.rb
 - lib/roundhouse/testing/inline.rb
 - lib/roundhouse/util.rb