qless 0.9.1 → 0.9.2

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

@@ -0,0 +1,90 @@
+<% if queues.empty? %>
+  <div class="page-header">
+    <h1>No Queues <small>I wish I had some queues :-/</small></h1>
+  </div>
+<% else %>
+  <div class="page-header">
+    <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>
+  <% end %>
+<% end %>
+
+<% if failed.empty? %>
+  <div class="page-header">
+    <h1>No Failed Jobs <small>Clean as a whistle</small></h1>
+  </div>
+<% else %>
+  <div class="page-header">
+    <h1>Failed Jobs <small>D'oh!</small></h1>
+  </div>
+  <% failed.sort_by { |t, count| -count }.each do |t, count| %>
+  <div class="row">
+    <div class="span4">
+      <h3 style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden"><a href="<%= u "/failed/#{t}" %>"><%= t %></a></h3>
+    </div>
+    <div class="span8">
+      <h3>| <%= count %> <small>Jobs</small></h3>
+    </div>
+  </div>
+  <% end %>
+<% end %>
+
+<% if tracked['jobs'].empty? %>
+  <div class="page-header">
+    <h1>No Tracked Jobs <small>These aren't the droids you're looking for</small></h1>
+  </div>
+<% else %>
+  <div class="page-header">
+    <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 %>
+<% end %>
+
+
+<% if workers.empty? %>
+  <div class="page-header">
+    <h1>No Workers <small>Nobody's doin' nothin'!</small></h1>
+  </div>
+<% else %>
+  <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 %>
+<% end %>

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

@@ -0,0 +1,122 @@
+<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<script type="text/javascript">
+  google.load("visualization", "1", {packages:["corechart"]});
+  google.setOnLoadCallback(drawCharts);
+
+  function drawCharts() {
+    drawChart(<%= JSON.generate(stats['wait']['histogram']) %>, 'wait-chart', 'Jobs / Minute');
+    drawChart(<%= JSON.generate(stats['run' ]['histogram']) %>, 'run-chart' , 'Jobs / Minute');
+  }
+
+  function drawChart(d, id, title) {
+    var data = new google.visualization.DataTable();
+    data.addColumn('string', 'Time');
+    data.addColumn('number', title);
+
+    var _data = [];
+    for (var i = 0; i < 60; ++i) {
+      _data.push([i + ' seconds', d[i] * 60]);
+    }
+    for (var i = 1; i < 60; ++i) {
+      _data.push([i + ' minutes', d[59 + i]]);
+    }
+    for (var i = 1; i < 24; ++i) {
+      _data.push([i + ' hours', d[118 + i] / 60]);
+    }
+    for (var i = 1; i < 7; ++i) {
+      _data.push([i + ' days', d[141 + i] / 1440]);
+    }
+    data.addRows(_data);
+
+    var options = {
+      legend: {position: 'none'},
+      chartArea: { width:"80%", height:"80%" }
+    };
+
+    var chart = new google.visualization.SteppedAreaChart(document.getElementById(id));
+    chart.draw(data, options);
+  }
+</script>
+
+<div class="subnav subnav-fixed">
+  <ul class="nav nav-pills">
+    <li class="<%= tab == 'stats'     ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/stats" %>">Stats</a></li>
+    <li class="<%= tab == 'running'   ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/running" %>">Running</a></li>
+    <li class="<%= tab == 'waiting'   ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/waiting" %>">Waiting</a></li>
+    <li class="<%= tab == 'scheduled' ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/scheduled" %>">Scheduled</a></li>
+    <li class="<%= tab == 'stalled'   ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/stalled" %>">Stalled</a></li>
+    <li class="<%= tab == 'depends'   ? 'active' : '' %>"><a href="<%= u "/queues/#{queue['name']}/depends" %>">Depends</a></li>
+  </ul>
+</div>
+
+<div id="alerts" style="margin-top: 40px"></div>
+
+<div class="row">
+  <div class="span8">
+    <h2><a href="<%= u "/queues/#{queue['name']}" %>"><%= queue['name'] %></a> |
+      <%= queue['running']   %> /
+      <%= queue['waiting']   %> /
+      <%= queue['scheduled'] %> /
+      <%= queue['stalled']   %> /
+      <%= queue['depends']   %> <small>(running / waiting / scheduled / stalled / depends)</small>
+    </h2>
+  </div>
+
+  <div class="span4">
+    <div style="float:right">
+      <h2>
+        <%= stats['failed']    %> /
+        <%= stats['failures']  %> /
+        <%= stats['retries']   %> <small>(failed / failures / retries)</small>
+      </h2>
+    </div>
+  </div>
+</div>
+
+<% if ['running', 'waiting', 'scheduled', 'stalled', 'depends'].include?(tab) %>
+  <hr/>
+  <%= erb :_job_list, :locals => { :jobs => jobs, :queues => queues } %>
+<% else %>
+  <div class="row" style="margin-top: 15px">
+    <div class="span6">
+      <div class="well">
+        <div class="row">
+          <div class="span12">
+            <h3>Waiting</h3>
+          </div>
+        </div>
+        <div class="row">
+          <div class="span12">
+            <h3>
+              <%= stats['wait']['count'] %> /
+              <%= sprintf('%10.3f', stats['wait']['mean']) %> /
+              <%= sprintf('%10.3f', stats['wait']['std']) %> <small>Total / Mean / Std. Deviation</small>
+            </h3>
+          </div>
+        </div>
+        <div id="wait-chart" class="queue-stats-time-histogram-wait" style="height: 500px"></div>
+      </div>
+    </div>
+
+    <div class="span6">
+      <div class="well">
+        <div class="row">
+          <div class="span12">
+            <h3>Running</h3>
+          </div>
+        </div>
+        <div class="row">
+          <div class="span12">
+            <h3>
+              <%= stats['run']['count'] %> /
+              <%= sprintf('%10.3f', stats['run']['mean']) %> /
+              <%= sprintf('%10.3f', stats['run']['std']) %> <small>Total / Mean / Std. Deviation</small>
+            </h3>
+          </div>
+        </div>
+
+        <div id="run-chart"  class="queue-stats-time-histogram-run"  style="height: 500px"></div>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,26 @@
+<% if queues.empty? %>
+  <div class="page-header">
+    <h1>No Queues <small>I wish I had some queues :-/</small></h1>
+  </div>
+<% else %>
+  <div class="page-header">
+    <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']   %> <small>(running / waiting / scheduled / stalled / depends)</small>
+      </h3>
+    </div>
+  </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,6 @@
+<div class="page-header">
+  <h2>Jobs tagged '<%= tag %>'</h2>
+</div>
+
+<%= erb :_job_list, :locals => { :jobs => jobs, :queues => queues } %>
+

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

@@ -0,0 +1,69 @@
+<script>
+var fade = function(jid, type) {
+  if (type == 'cancel' || type == 'untrack') {
+    $('#job-' + jid).slideUp();
+  }
+}
+</script>
+
+<div class="subnav subnav-fixed">
+  <ul class="nav nav-pills">
+    <li class="active"><a href="#all" data-toggle="tab">All (<%= tracked['jobs'].length %>)</a></li>
+    <li><a href="#running"   data-toggle="tab">Running (<%=   tracked['jobs'].select { |job| job.state == 'running'   }.length %>)</a></li>
+    <li><a href="#waiting"   data-toggle="tab">Waiting (<%=   tracked['jobs'].select { |job| job.state == 'waiting'   }.length %>)</a></li>
+    <li><a href="#scheduled" data-toggle="tab">Scheduled (<%= tracked['jobs'].select { |job| job.state == 'scheduled' }.length %>)</a></li>
+    <li><a href="#stalled"   data-toggle="tab">Stalled (<%=   tracked['jobs'].select { |job| job.state == 'stalled'   }.length %>)</a></li>
+    <li><a href="#completed" data-toggle="tab">Completed (<%= tracked['jobs'].select { |job| job.state == 'complete'  }.length %>)</a></li>
+    <li><a href="#failed"    data-toggle="tab">Failed (<%=    tracked['jobs'].select { |job| job.state == 'failed'    }.length %>)</a></li>
+	<li><a href="#depends"   data-toggle="tab">Depends (<%=   tracked['jobs'].select { |job| job.state == 'depends'   }.length %>)</a></li>
+  </ul>
+</div>
+
+<div id="alerts" style="margin-top: 40px"></div>
+
+<div class="page-header">
+  <h1>Tracked Jobs <small>These are all the jobs you're tracking</h1>
+</div>
+
+<div class="tab-content">
+  <div class="tab-pane active" id="all">
+    <% tracked['jobs'].each do |job| %>
+    <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+    <% end %>
+  </div>
+  <div class="tab-pane" id="running">
+    <% tracked['jobs'].select { |job| job.state == 'running' }.each do |job| %>
+    <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+    <% end %>
+  </div>
+  <div class="tab-pane" id="waiting">
+    <% tracked['jobs'].select { |job| job.state == 'waiting' }.each do |job| %>
+    <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+    <% end %>
+  </div>
+  <div class="tab-pane" id="scheduled">
+    <% tracked['jobs'].select { |job| job.state == 'scheduled' }.each do |job| %>
+    <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+    <% end %>
+  </div>
+  <div class="tab-pane" id="stalled">
+    <% tracked['jobs'].select { |job| job.state == 'stalled' }.each do |job| %>
+    <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+    <% end %>
+  </div>
+  <div class="tab-pane" id="completed">
+    <% tracked['jobs'].select { |job| job.state == 'complete' }.each do |job| %>
+    <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+    <% end %>
+  </div>
+  <div class="tab-pane" id="failed">
+    <% tracked['jobs'].select { |job| job.state == 'failed' }.each do |job| %>
+    <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+    <% end %>
+  </div>
+  <div class="tab-pane" id="depends">
+    <% tracked['jobs'].select { |job| job.state == 'depends' }.each do |job| %>
+    <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,34 @@
+<div class="subnav subnav-fixed">
+  <ul class="nav nav-pills">
+    <li><a href="#Running">Running</a></li>
+    <li><a href="#Stalled">Stalled</a></li>
+  </ul>
+</div>
+
+<div id="alerts" style="margin-top: 40px"></div>
+
+<% if worker['jobs'].length > 0 %>
+  <div class="page-header">
+    <h1><%= worker['name'] %> <small>Running Jobs</small></h1>
+  </div>
+
+  <% worker['jobs'].each do |job| %>
+  <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+  <% end %>
+<% end %>
+
+<% if worker['stalled'].length > 0 %>
+  <div class="page-header">
+    <h1><%= worker['name'] %> <small>Stalled Jobs</small></h1>
+  </div>
+
+  <% worker['stalled'].each do |job| %>
+  <%= erb :_job, :layout => false, :locals => { :job => job, :queues => queues } %>
+  <% end %>
+<% end %>
+
+<% if worker['stalled'].length + worker['jobs'].length == 0 %>
+  <div class="page-header">
+    <h1><%= worker['name'] %> <small>Isn't Doing Anything</small></h1>
+  </div>
+<% end %>

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

@@ -0,0 +1,14 @@
+<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 %>

data/lib/qless/version.rb

@@ -1,3 +1,3 @@
 module Qless
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/qless/worker.rb

@@ -10,9 +10,14 @@ module Qless
     def initialize(client, job_reserver, options = {})
       @client, @job_reserver = client, job_reserver
       @shutdown = @paused = false
+
       self.very_verbose = options[:very_verbose]
       self.verbose = options[:verbose]
       self.run_as_single_process = options[:run_as_single_process]
+      self.output = options.fetch(:output, $stdout)
+
+      output.puts "\n\n\n" if verbose || very_verbose
+      log "Instantiated Worker"
     end
 
     # Whether the worker should log basic info to STDOUT
@@ -26,6 +31,10 @@ module Qless
     # This should only be true in a dev/test environment
     attr_accessor :run_as_single_process
 
+    # An IO-like object that logging output is sent to.
+    # Defaults to $stdout.
+    attr_accessor :output
+
     # Starts a worker based on ENV vars. Supported ENV vars:
     #   - REDIS_URL=redis://host:port/db-num (the redis gem uses this automatically)
     #   - QUEUES=high,medium,low or QUEUE=blah
@@ -179,10 +188,10 @@ module Qless
     # Log a message to STDOUT if we are verbose or very_verbose.
     def log(message)
       if verbose
-        puts "*** #{message}"
+        output.puts "*** #{message}"
       elsif very_verbose
         time = Time.now.strftime('%H:%M:%S %Y-%m-%d')
-        puts "** [#{time}] #$$: #{message}"
+        output.puts "** [#{time}] #$$: #{message}"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qless
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -179,10 +195,6 @@ files:
 - lib/qless/job_reservers/ordered.rb
 - lib/qless/job_reservers/round_robin.rb
 - lib/qless/lua.rb
-- lib/qless/qless-core/ruby/lib/qless/core/version.rb
-- lib/qless/qless-core/ruby/lib/qless/core.rb
-- lib/qless/qless-core/ruby/lib/qless-core.rb
-- lib/qless/qless-core/ruby/spec/qless_core_spec.rb
 - lib/qless/queue.rb
 - lib/qless/server.rb
 - lib/qless/tasks.rb
@@ -209,9 +221,57 @@ files:
 - lib/qless/qless-core/tag.lua
 - lib/qless/qless-core/track.lua
 - lib/qless/qless-core/workers.lua
+- bin/install_phantomjs
 - bin/qless-campfire
 - bin/qless-growl
 - bin/qless-web
+- lib/qless/server/static/css/bootstrap-responsive.css
+- lib/qless/server/static/css/bootstrap-responsive.min.css
+- lib/qless/server/static/css/bootstrap.css
+- lib/qless/server/static/css/bootstrap.min.css
+- lib/qless/server/static/css/codemirror.css
+- lib/qless/server/static/css/docs.css
+- lib/qless/server/static/css/jquery.noty.css
+- lib/qless/server/static/css/noty_theme_twitter.css
+- lib/qless/server/static/css/style.css
+- lib/qless/server/static/favicon.ico
+- lib/qless/server/static/img/glyphicons-halflings-white.png
+- lib/qless/server/static/img/glyphicons-halflings.png
+- lib/qless/server/static/js/bootstrap-alert.js
+- lib/qless/server/static/js/bootstrap-scrollspy.js
+- lib/qless/server/static/js/bootstrap-tab.js
+- lib/qless/server/static/js/bootstrap-tooltip.js
+- lib/qless/server/static/js/bootstrap-typeahead.js
+- lib/qless/server/static/js/bootstrap.js
+- lib/qless/server/static/js/bootstrap.min.js
+- lib/qless/server/static/js/codemirror.js
+- lib/qless/server/static/js/jquery.noty.js
+- lib/qless/server/static/js/mode/javascript.js
+- lib/qless/server/static/js/theme/cobalt.css
+- lib/qless/server/static/js/theme/eclipse.css
+- lib/qless/server/static/js/theme/elegant.css
+- lib/qless/server/static/js/theme/lesser-dark.css
+- lib/qless/server/static/js/theme/monokai.css
+- lib/qless/server/static/js/theme/neat.css
+- lib/qless/server/static/js/theme/night.css
+- lib/qless/server/static/js/theme/rubyblue.css
+- lib/qless/server/static/js/theme/xq-dark.css
+- lib/qless/server/views/_job.erb
+- lib/qless/server/views/_job_list.erb
+- lib/qless/server/views/_pagination.erb
+- lib/qless/server/views/about.erb
+- lib/qless/server/views/config.erb
+- lib/qless/server/views/failed.erb
+- lib/qless/server/views/failed_type.erb
+- lib/qless/server/views/job.erb
+- lib/qless/server/views/layout.erb
+- lib/qless/server/views/overview.erb
+- lib/qless/server/views/queue.erb
+- lib/qless/server/views/queues.erb
+- lib/qless/server/views/tag.erb
+- lib/qless/server/views/track.erb
+- lib/qless/server/views/worker.erb
+- lib/qless/server/views/workers.erb
 homepage: http://github.com/seomoz/qless
 licenses: []
 post_install_message: 
@@ -224,12 +284,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4094860363148682256
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4094860363148682256
 requirements: []
 rubyforge_project: qless
 rubygems_version: 1.8.24