redact 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f859024a006575309d7d616e5a1c996e5c1e79c
-  data.tar.gz: 6ef60e3ad77160e2d22a1d538f71f10be6043962
+  metadata.gz: 35e086f4ccb38a982329db34080c075ad21811d0
+  data.tar.gz: 7a7d7951f84eca27e693396cc97b6856465f2185
 SHA512:
-  metadata.gz: 68805e7ee55892d4898e57ee98fb51307297090b7b4de6d444c98f21c05a3e388cb301b54bd6394e2ef3accf4594f5dc46f38f439836b143dcf6e5245b7b5ba5
-  data.tar.gz: 77ad7358b7ce73b0f90397c4fbf4a69842f2d1bdeeba74fa1346241e005c7ac17b594cfbd74d6832635e4ef6e25bb9732a62eedc48a6dd526a1428da9d0944a6
+  metadata.gz: 10146d81cc2d500cf314423236d8ab9b8efdccd15c1ee2ce2521633a77403bd06b5b1dbc0ad152146a38c4f02da3d73226feaea9632befdb276ce4e25a3fc3f4
+  data.tar.gz: bfd307a4d1c16b5da34a0be4ceece363ff7f7a53ba707da0f2473f13a68cbe5f588e788a990e575777eba5daaf43d4067a2f5e7d1ef84abcc6d07cfc3f36aae1

data/bin/redact-monitor

@@ -5,6 +5,7 @@ require 'redis'
 require "redact"
 require 'sinatra/base'
 require 'ostruct'
+require 'json'
 
 class Server < Sinatra::Base
   def initialize redact
@@ -13,25 +14,33 @@ class Server < Sinatra::Base
   end
 
   get '/' do
-    enqueued = @redact.enqueued_tasks.map  { |t| OpenStruct.new t }
-    in_progress = @redact.in_progress_tasks.map { |t| OpenStruct.new t }
-    done = @redact.done_tasks.map { |t| OpenStruct.new t }
+    enqueued = @redact.enqueued_tasks(0, 10).map  { |t| OpenStruct.new t }
+    in_progress = @redact.in_progress_tasks(0, 10).map { |t| OpenStruct.new t }
+    done = @redact.done_tasks(0, 10).map { |t| OpenStruct.new t }
 
     (enqueued + in_progress + done).each do |x|
       x.ago = pretty_time_diff((Time.now - x.ts).abs)
       x.time_in_queue = x.time_waiting ? pretty_time_diff(x.time_waiting.to_i) : ""
       x.time_in_progress = x.time_processing ? pretty_time_diff(x.time_processing.to_i) : ""
-      x.params = x.params.map { |k, v| "<b>#{k}</b>: #{v}<br/>" }.join
+      x.params = (x.params || {}).map { |k, v| "<b>#{k}</b>: #{v}<br/>" }.join
+      x.send "error?=", (x.state == "error")
+      x.backtrace_html = JSON.parse(x.backtrace).map { |x| Rack::Utils.escape_html(x) }.join("<br/>") if x.backtrace
       x.state_happiness = case x.state
         when "done"; "success"
         when "error"; "danger"
         when "skipped"; "warning"
         when "in_progress"; x.tries > 0 ? "warning" : ""
       end
-
     end
 
-    erb :index, locals: { enqueued: enqueued, in_progress: in_progress, done: done }
+    erb :index, locals: {
+      enqueued: enqueued,
+      in_progress: in_progress,
+      done: done,
+      num_enqueued: @redact.num_enqueued_tasks,
+      num_in_progress: @redact.num_in_progress_tasks,
+      num_done: @redact.num_done_tasks,
+    }
   end
 
   def pretty_time_diff diff

data/lib/redact.rb

@@ -33,6 +33,8 @@ class Redact
     @params_key = [@namespace, "params"].join
   end
 
+  attr_reader :dag
+
   ## Drop all data and reset the planner.
   def reset!
     keys = [@queue, @processing_list, @done_list, @dag_key, @params_key]
@@ -40,6 +42,21 @@ class Redact
     keys.each { |k| @redis.del k }
   end
 
+  def visualize stream=$stdout
+    sorted = @dag.tsort
+    leaves = sorted.select { |k| @dag[k].nil? || @dag[k].empty? }
+
+    pos = {}
+    curpos = 0
+    leaves.each do |l|
+      string = " #{l} "
+      pos[l] = curpos
+      stream.print string
+      curpos += string.length
+    end
+    stream.puts
+  end
+
   class CyclicDependencyError < StandardError; end
 
   ## Add a task with dependencies. +What+ is the name of a task (either a symbol
@@ -117,6 +134,7 @@ class Redact
   def enqueued_tasks start_idx=0, end_idx=-1
     @redis.lrange(@queue, start_idx, end_idx).map { |t| task_summary_for t }
   end
+  def num_enqueued_tasks; @redis.llen @queue end
 
   ## Returns information representing the set of tasks currently in process by
   ## worker processes. The return value is a hash that includes keys from
@@ -127,6 +145,7 @@ class Redact
   def in_progress_tasks start_idx=0, end_idx=-1
     @redis.lrange(@processing_list, start_idx, end_idx).map { |t| task_summary_for t }
   end
+  def num_in_progress_tasks; @redis.llen @processing_list end
 
   ## Returns information representing the set of tasks that have been
   ## completed. The return value is a hash that includes keys from
@@ -140,6 +159,7 @@ class Redact
   def done_tasks start_idx=0, end_idx=-1
     @redis.lrange(@done_list, start_idx, end_idx).map { |t| task_summary_for t }
   end
+  def num_done_tasks; @redis.llen @done_list end
 
   ## Yields tasks from the queue that are ready for execution. Callers should
   ## then perform the work for those tasks. Any exceptions thrown will result in the

data/views/index.erb

@@ -7,7 +7,7 @@
 </head>
 
 <body>
-  <h1>In Progress (<%= in_progress.size %>)</h1>
+  <h1>In Progress (<%= num_in_progress %>)</h1>
 
   <div class="table-responsive">
   <table class="table table-striped table-hover table-condensed">
@@ -36,7 +36,7 @@
   </table>
   </div>
 
-  <h1>Enqueued (<%= enqueued.size %>)</h1>
+  <h1>Enqueued (<%= num_enqueued %>)</h1>
 
   <div class="table-responsive">
   <table class="table table-striped table-hover table-condensed">
@@ -65,7 +65,7 @@
   </table>
   </div>
   
-  <h1>Recently completed (<%= done.size %>)</h1>
+  <h1>Recently completed (<%= num_done %>)</h1>
 
   <div class="table-responsive">
   <table class="table table-striped table-hover table-condensed">
@@ -83,7 +83,15 @@
     <tbody>
       <% done.each do |t| %>
         <tr class="<%= t.state_happiness %>">
-          <td><%= t.task %><br/><%= t.target %><br/><%= t.worker_id %></td>
+          <td>
+            <%= t.task %><br/>
+            <%= t.target %><br/>
+            <%= t.worker_id %><br/>
+            <% if t.error? %>
+              <b><%= t.error %></b><br/>
+              <%= t.backtrace_html %>
+            <% end %>
+          </td>
           <td><%= t.run_id %></td>
           <td><%= t.ago %></td>
           <td><%= t.state %></td>
@@ -91,6 +99,7 @@
           <td><%= t.time_in_progress %></td>
           <td><%= t.params %></td>
         </tr>
+
       <% end %>
     </tbody>
   </table>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redact
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - William Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop