qless 0.9.3 → 0.10.0

data/lib/qless/server/views/_job.erb

@@ -4,13 +4,13 @@
 	    <div class="row">
 	      <div class="span6">
 	        <h2 style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden">
-	          <a href="<%= u "/jobs/#{job.jid}" %>"><%= job.jid[0..8] %>...</a> | <%= job.klass_name %>
+	          <a href="<%= u "/jobs/#{job.jid}" %>" title="<%= job.jid %>"><%= job.jid[0..8] %>...</a> | <span title="<%= job.klass_name %>"><%= job.klass_name %></span>
 	        </h2>
 	      </div>
 	      <div class="span3">
 	        <h2 style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden">
 	          <strong>
-	            | <%= job.state %> / <a href="<%= u "/queues/#{job.queue_name}" %>"><%= job.queue_name %></a><%= job.worker_name.nil? ? "/ #{job.worker_name}" : "" %>
+	            | <%= job.state %> / <a href="<%= u "/queues/#{CGI::escape(job.queue_name)}" %>" title="<%= job.queue_name %><%= job.worker_name.nil? ? "/ #{job.worker_name}" : "" %>"><%= job.queue_name %></a><%= job.worker_name.nil? ? "/ #{job.worker_name}" : "" %>
 	          </strong>
 	        </h2>
 	      </div>
@@ -20,9 +20,12 @@
 	            <% if (job.state != "complete") %>
 	            <button title="delete" class="btn btn-danger" onclick="confirmation(this, 'Delete?', function() { cancel('<%= job.jid %>', fade) })"><i class="icon-remove"></i></button>
 	            <% end %>
+	            <% if (job.state == "running") %>
+	            <button title="Time out job" class="btn btn-danger" onclick="confirmation(this, 'Time out job?', function() { timeout('<%= job.jid %>') })"><i class="icon-time"></i></button>
+	            <% end %>
 	            <button title="track" class="btn<%= job.tracked ? " active" : "" %>" data-toggle="button" onclick="$(this).hasClass('active') ? untrack('<%= job.jid %>', fade) : track('<%= job.jid %>', [], fade)"><i class="icon-flag"></i></button>
 	            <% if (job.state == 'failed') %>
-	            <button title="retry" class="btn btn-success" onclick="retry('<%= job.jid %>', fade)"><i class="icon-repeat"></i></button>
+	            <button title="requeue" class="btn btn-success" onclick="retry('<%= job.jid %>', fade)"><i class="icon-repeat"></i></button>
 	            <% end %>
 	            <button title="move" class="btn dropdown-toggle btn-success" data-toggle="dropdown">
 	              <i class="caret"></i>
@@ -56,7 +59,7 @@
 	        <div style="float:left; margin-right: 10px"><h3>Dependencies:</h3></div>
 	        <% job.dependencies.each do |jid| %>
 	        <div class="btn-group" style="float:left; margin-right: 10px" id="<%= sanitize_attr("#{job.jid}-dependson-#{jid}") %>">
-	          <button class="btn" onclick="window.open('<%= u "/jobs/#{jid}" %>', '_blank')"><%= jid[0...8] %>...</button>
+	          <button class="btn" onclick="window.open('<%= u "/jobs/#{jid}" %>', '_blank')" title="<%= jid %>"><%= jid[0...8] %>...</button>
 	          <button class="btn dropdown-toggle" onclick="confirmation(this, 'Undepend?', function() { undepend('<%= job.jid %>', '<%= jid %>', function() { $('#<%= sanitize_attr("#{job.jid}-dependson-#{jid}") %>').remove()} ); })">
 	            <i class="icon-remove"></i>
 	          </button>
@@ -72,7 +75,7 @@
 	        <div style="float:left; margin-right: 10px"><h3>Dependents:</h3></div>
 	        <% job.dependents.each do |jid| %>
 	        <div class="btn-group" style="float:left; margin-right: 10px" id="<%= sanitize_attr("#{job.jid}-dependents-#{jid}") %>">
-	          <button class="btn" onclick="window.open('<%= u "/jobs/#{jid}" %>', '_blank')"><%= jid[0...8] %>...</button>
+	          <button class="btn" onclick="window.open('<%= u "/jobs/#{jid}" %>', '_blank')" title="<%= jid %>"><%= jid[0...8] %>...</button>
 	          <button class="btn dropdown-toggle" onclick="confirmation(this, 'Undepend?', function() { undepend('<%= jid %>', '<%= job.jid %>', function() { $('#<%= sanitize_attr("#{job.jid}-dependents-#{jid}") %>').remove()} ); })">
 	            <i class="icon-remove"></i>
 	          </button>
@@ -92,7 +95,7 @@
 	          </button>
 	        </div>
 	        <% end %>
-        
+
 	        <!-- One for adding new tags -->
 	        <div class="btn-group" style="float:left">
 	          <input class="span1 add-tag" type="text" placeholder="Add Tag" onchange="tag('<%= job.jid %>', $(this).val())"></input>
@@ -113,11 +116,26 @@
 	        <h3><small>History</small></h3>
 	        <div style="overflow-y:scroll; height: 200px">
 	          <% job.queue_history.reverse.each do |h| %>
-	          <pre><strong><%= h['q'] %></strong>
-	    Put: <%= strftime(h['put']) %><% if not h['popped'].nil? %>
-	    Pop: <%= strftime(h['popped']) %> by <%= h['worker'] %><% end %><% if not h['completed'].nil? %>
-	    Completed: <%= strftime(h['completed']) %><% end %><% if not h['failed'].nil? %>
-	    Failed: <%= strftime(h['failed']) %><% end %></pre>
+	          <% if h['what'] == 'put' %>
+	          	<pre><strong><%= h['what'] %></strong> at <%= strftime(h['when']) %>
+    in queue <strong><%= h['q'] %></strong></pre>
+	          <% elsif h['what'] == 'popped' %>
+	          	<pre><strong><%= h['what'] %></strong> at <%= strftime(h['when']) %>
+    by <strong><%= h['worker'] %></strong></pre>
+	          <% elsif h['what'] == 'done' %>
+	          	<pre><strong>completed</strong> at <%= strftime(h['when']) %></pre>
+	          <% elsif h['what'] == 'failed' %>
+	          	<% if h['worker'] %>
+	          	  <pre><strong><%= h['what'] %></strong> at <%= strftime(h['when']) %>
+    by <strong><%= h['worker'] %></strong>
+    in group <strong><%= h['group'] %></strong></pre>
+	          	<% else %>
+	          	  <pre><strong><%= h['what'] %></strong> at <%= strftime(h['when']) %>
+    in group <strong><%= h['group'] %></strong></pre>
+	          	<% end %>
+	          <% else %>
+	          	<pre><strong><%= h['what'] %></strong> at <%= strftime(h['when']) %></pre>
+	          <% end %>
 	          <% end %>
 	        </div>
 	      </div>
@@ -144,13 +162,13 @@
 	    <div class="row">
 	      <div class="span6">
 	        <h2 style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden">
-	          <a href="<%= u "/jobs/#{job.jid}" %>"><%= job.jid[0..8] %>...</a> | <%= job.klass_name %>
+	          <a href="<%= u "/jobs/#{job.jid}" %>" title="<%= job.jid %>"><%= job.jid[0..8] %>...</a> | <span title="<%= job.klass_name %>"><%= job.klass_name %></span>
 	        </h2>
 	      </div>
 	      <div class="span3">
 	        <h2 style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden">
 	          <strong>
-	            | recurring / <a href="<%= u "/queues/#{job.queue_name}" %>"><%= job.queue_name %></a>
+	            | recurring / <a href="<%= u "/queues/#{CGI::escape(job.queue_name)}" %>" title="<%= job.queue_name %>"><%= job.queue_name %></a>
 	          </strong>
 	        </h2>
 	      </div>
@@ -183,7 +201,7 @@
 	        </div>
 	      </div>
 	    </div>
-      
+
 	    <div class="row">
 	      <div class="span12 tags" style="margin-bottom: 3px;">
 	        <% job.tags.each do |tag| %>
@@ -194,7 +212,7 @@
 	          </button>
 	        </div>
 	        <% end %>
-        
+
 	        <!-- One for adding new tags -->
 	        <div class="btn-group" style="float:left">
 	          <input class="span1 add-tag" type="text" placeholder="Add Tag" onchange="tag('<%= job.jid %>', $(this).val())"></input>

data/lib/qless/server/views/completed.erb

@@ -0,0 +1,11 @@
+<% if jobs.empty? %>
+  <div class="page-header">
+    <h1>No Completed Jobs<small>(yet)</small></h1>
+  </div>
+<% else %>
+  <div class="page-header">
+    <h1>Completed Jobs <small>You must be doing something right!</small></h1>
+  </div>
+<% end %>
+
+<%= erb :_job_list, :locals => { :jobs => jobs, :queues => queues } %>

data/lib/qless/server/views/layout.erb

@@ -12,13 +12,13 @@
     <link href="<%= u '/css/docs.css' %>" rel="stylesheet">
     <link href="<%= u '/css/jquery.noty.css' %>" rel="stylesheet">
     <link href="<%= u '/css/noty_theme_twitter.css' %>" rel="stylesheet">
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
 
     <style type="text/css">
     body {
       padding-top: 60px;
     }
-    
+
     .btn-group span {
       /* This is ugly. Anyone want to change it? */
       border-color: #e6e6e6 #e6e6e6 #bfbfbf;
@@ -30,7 +30,7 @@
       line-height: 18px;
       padding: 4px 10px 4px;
     }
-    
+
 	 .btn-group input, .btn-group span {
       position: relative;
       float: left;
@@ -40,7 +40,7 @@
       border-radius: 0;
       margin-bottom: 0px;
 	  }
-    
+
     .btn-group input:first-child, .btn-group span:first-child {
       margin-left: 0;
       -webkit-border-top-left-radius: 4px;
@@ -50,6 +50,15 @@
       -moz-border-radius-bottomleft: 4px;
       border-bottom-left-radius: 4px;
     }
+
+    .large-text {
+      font-size:18px;
+    }
+
+    .queue-column {
+      min-width:300px;
+    }
+
     </style>
 
     <script type="text/javascript">
@@ -84,7 +93,7 @@
         url: '<%= u "/move" %>',
         data: {id:jid, queue:queue},
         success: function() { flash('Moved ' + jid + ' to ' + queue, 'success', 1500); cb(jid, queue); },
-        erorr:   function() { flash('Failed to move ' + jid + ' to ' + queue); }
+        error:   function() { flash('Failed to move ' + jid + ' to ' + queue); }
       });
     }
 
@@ -94,7 +103,7 @@
         url: '<%= u "/retry" %>',
         data: {id:jid},
         success: function() { flash('Retrying ' + jid, 'success', 1500); if (cb) { cb(jid, 'retry'); } },
-        erorr:   function() { flash('Failed to retry ' + jid); }
+        error:   function() { flash('Failed to retry ' + jid); }
       });
     }
 
@@ -198,13 +207,13 @@
         action();
       });
     }
-    
+
     /* Helper function for adding a tag to a job */
     var tag = function(jid, tag) {
       var data  = {};
       data[jid] = [tag];
       // The button group of the 'add tag' bit
-      var group = 
+      var group =
       _ajax({
         url: '<%= u "/tag" %>',
         data: data,
@@ -222,13 +231,13 @@
         }
       });
     }
-    
+
     /* Helper function for untagging a job */
     var untag = function(jid, tag) {
       var data  = {};
       data[jid] = [tag];
       // The button group of the 'add tag' bit
-      var group = 
+      var group =
       _ajax({
         url: '<%= u "/untag" %>',
         data: data,
@@ -241,7 +250,7 @@
         }
       });
     }
-    
+
     /* Helper function for changing a job's priority */
     var priority = function(jid, priority) {
       var p     = parseInt(priority);
@@ -272,6 +281,56 @@
       }
     }
 
+    var pause = function(queue) {
+      _ajax({
+        url: '<%= u "/pause" %>',
+        data: {
+          'queue': queue
+        }, success: function(data) {
+          var button = $('#' + queue + '-pause');
+          button.attr('title', 'Unpause').attr(
+            'data-original-title', 'Unpause');
+          button.addClass('btn-success').removeClass('btn-warning');
+          button.children().addClass('icon-play').removeClass('icon-pause');
+          button.attr('onclick', 'unpause("' + queue + '")');
+        }, error: function() {
+          flash('Couldn\'t pause queue ' + queue);
+        }
+      })
+    }
+
+    var unpause = function(queue) {
+      _ajax({
+        url: '<%= u "/unpause" %>',
+        data: {
+          'queue': queue
+        }, success: function(data) {
+          var button = $('#' + queue + '-pause');
+          button.attr('title', 'Pause').attr(
+            'data-original-title', 'Pause');
+          button.addClass('btn-warning').removeClass('btn-success');
+          button.children().addClass('icon-pause').removeClass('icon-play');
+          button.attr('onclick', 'pause("' + queue + '")');
+        }, error: function() {
+          flash('Couldn\'t unpause queue ' + queue);
+        }
+      })
+    }
+
+    var timeout = function(jid) {
+      _ajax({
+        url: '<%= u "/timeout" %>',
+        data: {
+          'jid': jid
+        }, success: function(data) {
+          flash('Job timed out', 'success');
+        }, error: function(data) {
+          flash('Failed to time out job: ' + data);
+          console.log(data);
+        }
+      })
+    }
+
     $(document).ready(function() {
       $('button').tooltip({delay:200});
     });

data/lib/qless/server/views/overview.erb

@@ -7,23 +7,49 @@
     <h1>Queues <small>And their job counts</small></h1>
   </div>
 
-  <% queues.each do |queue| %>
-  <div class="row">
-    <div class="span4">
-      <h3><a href="<%= u "/queues/#{queue['name']}" %>"><%= queue['name'] %></a></h3>
-    </div>
-    <div class="span8">
-      <h3> |
-        <%= queue['running']   %> /
-        <%= queue['waiting']   %> /
-        <%= queue['scheduled'] %> /
-        <%= queue['stalled']   %> /
-        <%= queue['depends']   %> /
-        <%= queue['recurring'] %> <small>(running / waiting / scheduled / stalled / depends / recurring)</small>
-      </h3>
-    </div>
-  </div>
+  <table class="table">
+    <thead>
+      <tr>
+        <th></th>
+        <th>running</th>
+        <th>waiting</th>
+        <th>scheduled</th>
+        <th>stalled</th>
+        <th>depends</th>
+        <th>recurring</th>
+      </tr>
+    </thead>
+    <tbody>
+    <% queues.each do |queue| %>
+    <tr class="queue-row">
+      <td class="queue-column large-text">
+        <% if queue['paused'] %>
+          <button
+            id="<%= queue['name'] %>-pause"
+            title="Unpause"
+            class="btn btn-success"
+            onclick="unpause('<%= queue['name'] %>')"><i class="icon-play"></i>
+          </button>
+        <% else %>
+          <button
+            id="<%= queue['name'] %>-pause"
+            title="Pause"
+            class="btn btn-warning"
+            onclick="pause('<%= queue['name'] %>')"><i class="icon-pause"></i>
+          </button>
+        <% end %>
+        <a href="<%= u "/queues/#{CGI::escape(queue['name'])}" %>"><%= queue['name'] %></a>
+      </td>
+      <td><%= queue['running']   %></td>
+      <td><%= queue['waiting']   %></td>
+      <td><%= queue['scheduled'] %></td>
+      <td><%= queue['stalled']   %></td>
+      <td><%= queue['depends']   %></td>
+      <td><%= queue['recurring'] %></td>
+    </tr>
   <% end %>
+  </tbody>
+</table>
 <% end %>
 
 <% if failed.empty? %>
@@ -34,22 +60,23 @@
   <div class="page-header">
     <h1>Failed Jobs <small>D'oh!</small></h1>
   </div>
-  <div class="l-sidebyside failed-job">
-    <div class="min-col-size">
-      <% failed.sort_by { |t, count| -count }.each do |t, count| %>
-      <div class="row">
-        <h3><a href="<%= u "/failed/#{t}" %>"><%= t %></a></h3>
-      </div>
-      <% end %>
-    </div>
-    <div>
-      <% failed.sort_by { |t, count| -count }.each do |t, count| %>
-      <div class="row">
-        <h3>| <%= count %> <small>Jobs</small></h3>
-      </div>
-      <% end %>
-    </div>
-  </div>
+
+  <table class="table">
+    <thead>
+      <tr>
+        <th>failure</th>
+        <th>count</th>
+      </tr>
+    </thead>
+    <tbody>
+    <% failed.sort_by { |t, count| -count }.each do |t, count| %>
+    <tr class="failed-row">
+      <td class="large-text"><a href="<%= u "/failed/#{t}" %>"><%= t %></a></td>
+      <td><%= count %></td>
+    </tr>
+    <% end %>
+    </tbody>
+  </table>
 <% end %>
 
 <% if tracked['jobs'].empty? %>
@@ -61,16 +88,22 @@
     <h1>Tracked Jobs <small>These <i>are</i> the droids you're looking for</small></h1>
   </div>
   <% counts = Hash.new; tracked['jobs'].each { |job| counts[job.state] ||= 0; counts[job.state] += 1 } %>
-  <% counts.sort_by { |state, count| - count }.each do |state, count| %>
-  <div class="row">
-    <div class="span4">
-      <h3><a href="<%= u "/track##{state}" %>"><%= state %></a></h3>
-    </div>
-    <div class="span8">
-      <h3>| <%= count %> <small>Jobs</small></h3>
-    </div>
-  </div>
-  <% end %>
+  <table class="table">
+    <thead>
+      <tr>
+        <th>state</th>
+        <th>count</th>
+      </tr>
+    </thead>
+    <tbody>
+    <% counts.sort_by { |state, count| - count }.each do |state, count| %>
+    <tr class="tracked-row">
+      <td class="large-text"><a href="<%= u "/track##{state}" %>"><%= state %></a></td>
+      <td><%= count %></td>
+    </tr>
+    <% end %>
+    </tbody>
+  </table>
 <% end %>
 
 <% if workers.empty? %>
@@ -81,15 +114,22 @@
   <div class="page-header">
     <h1>Current Workers <small>And their job counts</small></h1>
   </div>
-
-  <% workers.each do |worker| %>
-  <div class="row">
-    <div class="span4">
-      <h3><a href="<%= u "/workers/#{worker['name']}" %>"><%= worker['name'] %></a></h3>
-    </div>
-    <div class="span8">
-      <h3>| <%= worker['jobs'] %> / <%= worker['stalled'] %> <small>Running / Stalled</small></h3>
-    </div>
-  </div>
-  <% end %>
+  <table class="table">
+    <thead>
+      <tr>
+        <th></th>
+        <th>running</th>
+        <th>stalled</th>
+      </tr>
+    </thead>
+    <tbody>
+    <% workers.each do |worker| %>
+    <tr class='worker-row'>
+      <td class="large-text"><a href="<%= u "/workers/#{worker['name']}" %>"><%= worker['name'] %></a></td>
+      <td><%= worker['jobs'] %></td>
+      <td><%= worker['stalled'] %></td>
+    </tr>
+    <% end %>
+    </tbody>
+  </table>
 <% end %>