workerholic 0.0.8 → 0.0.9

data/spec/job_processor_spec.rb

@@ -11,7 +11,7 @@ end
 
 describe Workerholic::JobProcessor do
   it 'processes a simple job' do
-    job = Workerholic::JobWrapper.new(class: SimpleJobTest, arguments: ['test job'])
+    job = Workerholic::JobWrapper.new(klass: SimpleJobTest, arguments: ['test job'])
     serialized_job = Workerholic::JobSerializer.serialize(job)
 
     job_processor = Workerholic::JobProcessor.new(serialized_job)
@@ -22,9 +22,9 @@ describe Workerholic::JobProcessor do
 
   it 'processes a complex job' do
     serialized_job = Workerholic::JobSerializer.serialize({
-      class: ComplexJobTest,
+      klass: ComplexJobTest,
       arguments: ['test job', { a: 1, b: 2 }, [1, 2, 3]],
-      statistics: Workerholic::Statistics.new.to_hash
+      statistics: Workerholic::JobStatistics.new.to_hash
     })
 
     job_processor = Workerholic::JobProcessor.new(serialized_job)
@@ -35,9 +35,9 @@ describe Workerholic::JobProcessor do
 
   it 'does not raise an error when processing a job with error' do
     serialized_job = Workerholic::JobSerializer.serialize({
-                       class: SimpleJobTestWithError,
+                       klass: SimpleJobTestWithError,
                        arguments: [],
-                       statistics: Workerholic::Statistics.new.to_hash
+                       statistics: Workerholic::JobStatistics.new.to_hash
                      })
 
     job_processor = Workerholic::JobProcessor.new(serialized_job)
@@ -47,9 +47,9 @@ describe Workerholic::JobProcessor do
 
   it 'retries job when job processing fails' do
     job = {
-      class: SimpleJobTestWithError,
+      klass: SimpleJobTestWithError,
       arguments: [],
-      statistics: Workerholic::Statistics.new.to_hash
+      statistics: Workerholic::JobStatistics.new.to_hash
     }
     serialized_job = Workerholic::JobSerializer.serialize(job)
 

data/spec/{statistics_spec.rb → job_statistics.rb}

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
-describe Workerholic::Statistics do
-  it 'initializes attributes with without an argument' do
-    statistics = Workerholic::Statistics.new
+describe Workerholic::JobStatistics do
+  it 'initializes attributes if no argument supplied' do
+    statistics = Workerholic::JobStatistics.new
+    expect(statistics.failed_on).to be_nil
     expect(statistics.enqueued_at).to be_nil
     expect(statistics.errors).to eq([])
     expect(statistics.started_at).to be_nil
@@ -13,13 +14,17 @@ describe Workerholic::Statistics do
     enqueuing_time = Time.now.to_f - 86400
     started_at_time = Time.now.to_f
     completed_at_time = Time.now.to_f + 86400
+    elapsed_time = '%.10f' % (completed_at_time - started_at_time)
+
     options = {
       enqueued_at: enqueuing_time,
       errors: ['Your job is bad and you should feel bad'],
       started_at: started_at_time,
-      completed_at: completed_at_time
+      completed_at: completed_at_time,
+      elapsed_time: elapsed_time,
+      failed_on: nil
     }
 
-    expect(Workerholic::Statistics.new(options).to_hash).to eq(options)
+    expect(Workerholic::JobStatistics.new(options).to_hash).to eq(options)
   end
 end

data/spec/job_wrapper_spec.rb

@@ -2,10 +2,11 @@ require_relative 'spec_helper'
 
 describe Workerholic::JobWrapper do
   it 'returns a hash with job meta info and job stats info' do
-    job = Workerholic::JobWrapper.new(class: SimpleJobTest, arguments: ['test job'])
+    job = Workerholic::JobWrapper.new(klass: SimpleJobTest, arguments: ['test job'])
 
     expected_result = {
-      class: SimpleJobTest,
+      klass: SimpleJobTest,
+      wrapper: nil,
       arguments: ['test job'],
       retry_count: 0,
       execute_at: nil,
@@ -13,14 +14,16 @@ describe Workerholic::JobWrapper do
         enqueued_at: nil,
         errors: [],
         started_at: nil,
-        completed_at: nil
+        completed_at: nil,
+        failed_on: nil,
+        elapsed_time: nil
       }
     }
     expect(job.to_hash).to eq(expected_result)
   end
 
   it 'performs the job' do
-    job = Workerholic::JobWrapper.new(class: SimpleJobTest, arguments: ['test job'])
+    job = Workerholic::JobWrapper.new(klass: SimpleJobTest, arguments: ['test job'])
 
     expect(job.perform).to eq('test job')
   end

data/spec/worker_spec.rb

@@ -20,9 +20,9 @@ describe Workerholic::Worker do
   let(:redis) { Redis.new }
   let(:job) do
     {
-      class: WorkerJobTest,
+      klass: WorkerJobTest,
       arguments: [],
-      statistics: Workerholic::Statistics.new.to_hash
+      statistics: Workerholic::JobStatistics.new.to_hash
     }
   end
 

data/web/application.rb

@@ -1,7 +1,12 @@
+require 'redis'
 require 'sinatra'
 require 'sinatra/reloader'
 
 get '/' do
+  redirect '/overview'
+end
+
+get '/overview' do
   erb :index
 end
 
@@ -10,21 +15,23 @@ get '/details' do
 end
 
 get '/queues' do
-  #placeholder
-  erb :index
+  erb :queues
 end
 
 get '/workers' do
-  #placeholder
   erb :workers
 end
 
 get '/failed' do
-  #placeholder
-  erb :index
+  erb :failed
 end
 
 get '/scheduled' do
-  #placeholder
   erb :scheduled
 end
+
+get '/redis-data' do
+  redis = Redis.new
+
+  (1..redis.mget('data')[0].to_i).to_a.sample.to_s
+end

data/web/public/javascripts/application.js

@@ -0,0 +1,109 @@
+$(document).ready(function() {
+  var tab = $(location).attr('href').split('/').pop();
+  var $active = $('a[href=' + tab + ']');
+  $active.css('background', '#a2a2a2');
+  $active.css('color', '#fff');
+
+  setInterval(getDataFromRedis, 5000);
+
+  var chart = new CanvasJS.Chart('chart_container', {
+    title: {
+      text: 'Overview',
+      fontSize: 24,
+    },
+    axisX: {
+      reversed: true,
+      gridColor: 'Silver',
+      tickColor: 'silver',
+      animationEnabled: true,
+      title: 'Time ago (s)',
+      // minimum: 0,
+      maximum: 65
+    },
+    toolTip: {
+      shared: true
+    },
+		theme: "theme2",
+		axisY: {
+			gridColor: "Silver",
+			tickColor: "silver"
+		},
+		legend:{
+			verticalAlign: "center",
+			horizontalAlign: "right"
+		},
+		data: [{
+			type: "line",
+			showInLegend: true,
+			lineThickness: 2,
+			name: "Queued Jobs",
+			markerType: "square",
+			color: "#F08080",
+  		dataPoints: [
+          { x: '0', y: 510 },
+          { x: '5', y: 570 },
+          { x: '10', y: 510 },
+          { x: '15', y: 510 },
+          { x: '20', y: 610 },
+          { x: '25', y: 510 },
+          { x: '30', y: 510 },
+          { x: '35', y: 510 },
+          { x: '40', y: 510 },
+          { x: '45', y: 910 },
+          { x: '50', y: 510 },
+          { x: '55', y: 710 },
+          { x: '60', y: 510 },
+  		  ]
+  		},
+      {
+			type: "line",
+			showInLegend: true,
+			name: "Finished Jobs",
+			color: "#20B2AA",
+			lineThickness: 2,
+
+			dataPoints: [
+        { x: '0', y: 430 },
+        { x: '5', y: 580 },
+        { x: '10', y: 420 },
+        { x: '15', y: 110 },
+        { x: '20', y: 180 },
+        { x: '25', y: 900 },
+        { x: '30', y: 510 },
+        { x: '35', y: 510 },
+        { x: '40', y: 510 },
+        { x: '45', y: 510 },
+        { x: '50', y: 670 },
+        { x: '55', y: 990 },
+        { x: '60', y: 240 },
+			]
+		}
+
+
+		],
+    legend: {
+      cursor: "pointer",
+      itemclick: function(e){
+        if (typeof(e.dataSeries.visible) === "undefined" || e.dataSeries.visible) {
+        	e.dataSeries.visible = false;
+        }
+        else{
+          e.dataSeries.visible = true;
+        }
+        chart.render();
+      }
+    }
+	});
+
+  chart.render();
+});
+
+function getDataFromRedis() {
+  $.ajax({
+    url: '/redis-data',
+    data: 'something',
+    success: function(data) {
+      $('.data').text(data);
+    }
+  });
+}

data/web/public/stylesheets/application.css

@@ -2,7 +2,7 @@
 
 body {
   font-family: Arial, sans-serif;
-  background: #FFD252;
+  background: #f2f2f2;
 }
 
 header {
@@ -13,6 +13,12 @@ header {
   background: linear-gradient(to bottom, #3A0E40, #E739FF);
 }
 
+section {
+  width: 1200px;
+  padding-bottom: 100px;
+  margin: 0 auto;
+}
+
 footer {
   position: fixed;
   bottom: 0;
@@ -30,24 +36,34 @@ nav {
   background: #fff;
 }
 
-nav li {
-  display: inline-block;
-  font-size: 20px;
-  padding: 10px 0 10px 0;
-  margin-left: 20px;
-  color: #000;
-}
-
 nav a {
   display: inline-block;
-  width: 100px;
-  padding: 20px;
+  width: 100%;
+  padding: 10px;
   text-align: center;
-  text-decoration: none;
   border-radius: 5px;
-  border: 3px solid #E739FF;
+  color: #000;
+  background: #cecece;
+}
+
+nav a:hover {
   color: #fff;
-  background: #A016B2;
+  background: #a2a2a2;
+}
+
+.table {
+  width: 1200px;
+  margin-top: 100px;
+  border: 1px solid #c5c5c5;
+  /*border-radius: 5px;*/
+}
+
+.last_row {
+  border-top: 5px solid #a1a1a1;
+}
+
+.data {
+  width: 200px;
 }
 
 #statistics {

data/web/views/details.erb

@@ -1,32 +1,49 @@
-<html>
-  <head>
-    <title>Workerholic Overview</title>
-    <link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
-    <link href='stylesheets/application.css' rel='stylesheet'>
-  </head>
+<table class='table'>
+  <thead>
+    <tr>
+      <th>Class</th>
+      <th>Enqueued</th>
+      <th>Failed</th>
+      <th>Completed</th>
+      <th>Total</th>
+    </tr>
+  </thead>
 
-  <body>
-    <header>
-      Workerholic
-    </header>
-    <nav>
-      <ul>
-        <li><a href='/'>Overview</a></li>
-        <li><a href='/details'>Job Details</a></li>
-        <li><a href='/queues'>Queues</a></li>
-        <li><a href='/queues'>Workers</a></li>  
-        <li><a href='/what'>Failed</a></li>
-        <li><a href='/what'>Scheduled</a></li>
-      </ul>
-    </nav>
-
-    <div id="statistics">
-      <h2>Your current active queues:</h2>
-      <p>JobTestFast: 1,234</p>
-      <p>JobtestSlow: 2,144,822</p>
-      <p>GetPrimes:     102,891</p>
-      <p>Total: 2,248,947</p>
-    </div>
-
-  </body>
-</html>
+  <tbody>
+    <tr>
+      <td>JobTestFast</td>
+      <td>1,833,222</td>
+      <td>171,882</td>
+      <td>22,198,122</td>
+      <td>24,123,233</td>
+    </tr>
+    <tr>
+      <td>JobTestSlow</td>
+      <td>1,833,222</td>
+      <td>171,882</td>
+      <td>22,198,122</td>
+      <td>24,123,233</td>
+    </tr>
+    <tr>
+      <td>GetPrime</td>
+      <td>1,833,222</td>
+      <td>171,882</td>
+      <td>22,198,122</td>
+      <td>24,123,233</td>
+    </tr>
+    <tr>
+      <td>SendWelcomeEmail</td>
+      <td>1,833,222</td>
+      <td>171,882</td>
+      <td>22,198,122</td>
+      <td>24,123,233</td>
+    </tr>
+    <tr class='last_row'>
+      <th>Total:</td>
+      <td>1,833,222</td>
+      <td>171,882</td>
+      <td>22,198,122</td>
+      <td>24,123,233</td>
+    </tr>
+  </tbody>
+</table>

data/web/views/failed.erb

@@ -0,0 +1,27 @@
+<table class='table'>
+  <thead>
+    <tr>
+      <th>Queue Name</th>
+      <th>Class</th>
+      <th>Job ID</th>
+      <th>Time</th>
+      <th>Error</th>
+    </tr>
+  </thead>
+
+  <tr>
+    <td>workerholic:queue:main</td>
+    <td>JobTestFast</td>
+    <td>22</td>
+    <td>07-26-2017 18:21:44</td>
+    <td>ArgumentError: Wrong number of arguments. (0 for 2)</td>
+  </tr>
+
+  <tr>
+    <td>workerholic:queue:main</td>
+    <td>JobTestFast</td>
+    <td>22</td>
+    <td>07-26-2017 18:21:44</td>
+    <td>ArgumentError: ....</td>
+  </tr>
+</table>

data/web/views/index.erb

@@ -1,35 +1,40 @@
-<html>
-  <head>
-    <title>Workerholic Overview</title>
-    <link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
-    <link href='stylesheets/application.css' rel='stylesheet'>
-  </head>
+<!-- <div id="statistics">
+  <h2>Your current jobs overview</h2>
+  <p id="completed">Finished Jobs: 0</p>
+  <p>Jobs in queue: 100,000,000</p>
+  <p id="failed">Jobs failed: 10,000,000</p>
+</div> -->
 
-  <body>
-    <header>
-      Workerholic
-    </header>
-    <nav>
-      <ul>
-        <li><a href='/'>Overview</a></li>
-        <li><a href='/details'>Job Details</a></li>
-        <li><a href='/placehold'>Queues</a></li>
-        <li><a href='/workers'>Workers</a></li>
-        <li><a href='/what'>Failed</a></li>
-        <li><a href='/what'>Scheduled</a></li>
-      </ul>
-    </nav>
+<table class='table is-striped'>
+  <thead>
+    <tr>
+      <th>Category</th>
+      <th>Count</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Finished Jobs</td>
+      <td class='data'>10,000,000</td>
+    </tr>
+    <tr>
+      <td>Queued Jobs</td>
+      <td class='data'>1,000,000</td>
+    </tr>
+    <tr>
+      <td>Failed Jobs</td>
+      <td class='data'>1,000,000</td>
+    </tr>
+    <tr>
+      <td>Number of Queues</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Number of Workers</td>
+      <td>25</td>
+    </tr>
+  </tbody>
+</table>
 
-    <div id="statistics">
-      <h2>Your current jobs overview</h2>
-      <p id="completed">Finished Jobs: 0</p>
-      <p>Jobs in queue: 100,000,000</p>
-      <p id="failed">Jobs failed: 10,000,000</p>
-    </div>
-
-    <footer>
-      <p>&copy; 2017 Workerholic. All rights reserved.</p>
-    </footer>
-
-  </body>
-</html>
+<div id="chart_container" style="height: 300px; width: 100%">
+</div>

data/web/views/layout.erb

@@ -0,0 +1,36 @@
+<html>
+  <head>
+    <title>Workerholic Overview</title>
+    <link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.4.4/css/bulma.css" rel="stylesheet">
+    <link href='stylesheets/application.css' rel='stylesheet'>
+    <script src="https://canvasjs.com/assets/script/canvasjs.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <script src="javascripts/application.js"></script>
+  </head>
+
+  <body>
+    <header>
+      Workerholic
+    </header>
+
+    <nav>
+      <ul class='columns'>
+        <li class='column'><a href='overview'>Overview</a></li>
+        <li class='column'><a href='details'>Job Details</a></li>
+        <li class='column'><a href='queues'>Queues</a></li>
+        <li class='column'><a href='workers'>Workers</a></li>
+        <li class='column'><a href='failed'>Failed</a></li>
+        <li class='column'><a href='scheduled'>Scheduled</a></li>
+      </ul>
+    </nav>
+
+    <section>
+      <%= yield %>
+    </section>
+
+    <footer>
+      <p>&copy; 2017 Workerholic. All rights reserved.</p>
+    </footer>
+  </body>
+</html>

data/web/views/queues.erb

@@ -0,0 +1,31 @@
+<table class='table'>
+  <thead>
+    <tr>
+      <th>Queue Name</th>
+      <th>Job Load</th>
+      <th>Worker Count</th>
+      <th>Jobs Processed per second</th>
+    </tr>
+  </thead>
+
+  <tr>
+    <td>workerholic:queue:main</td>
+    <td>485,981</td>
+    <td>12</td>
+    <td>1442</td>
+  </tr>
+
+  <tr>
+    <td>workerholic:queue:api</td>
+    <td>75,912,999</td>
+    <td>13</td>
+    <td>1233</td>
+  </tr>
+
+  <tr class='last_row'>
+    <th>Total:</td>
+    <td>76,984,123</td>
+    <td>25</td>
+    <td>2675</td>
+  </tr>
+</table>

data/web/views/scheduled.erb

@@ -0,0 +1,27 @@
+<table class='table'>
+  <thead>
+    <tr>
+      <th>Class</th>
+      <th>Execute on</th>
+      <th>Arguments</th>
+    </tr>
+  </thead>
+
+  <tr>
+    <td>GithubAPIWrapper</td>
+    <td>07-29-17 00:00:00</td>
+    <td>{ username: 'tim-lee92', repo: 'workerholic' }</td>
+  </tr>
+
+  <tr>
+    <td>GithubAPIWrapper</td>
+    <td>07-29-17 00:00:00</td>
+    <td>{ username: 'tim-lee92', repo: 'workerholic' }</td>
+  </tr>
+
+  <tr>
+    <td>GithubAPIWrapper</td>
+    <td>07-29-17 00:00:00</td>
+    <td>{ username: 'tim-lee92', repo: 'workerholic' }</td>
+  </tr>
+</table>