workerholic 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfae6532e0efa5d65df17f7809ecc5130e50d85b
-  data.tar.gz: b23e1f15e6ba5f1bc1494f98c01eefda76969bea
+  metadata.gz: 5697ecb058b0b8b66d692e0eba642dbf698396d9
+  data.tar.gz: eb530802994993ed86b5f46dcdb9bef99520e992
 SHA512:
-  metadata.gz: 573cd2b6034209e578c3305ffdcec17a6a2da39d20f74b84e747a8a2a7e87b8f7ffc7c4158cdd5f3a39183069151af4bf5ddd7b5a96ec27ec782febdce0cedb1
-  data.tar.gz: fb8a13ed3494db31e9177ddbddcac240121b3bd24ec603aa4f521bc8b676b6df49af99e3af87791a49bdb3619a4eaa3171b75edc7203925f7ff256e8b8263b1a
+  metadata.gz: 4aa98b63177bc19f3cbf4987d423e47cc90eee0d6d1e1151bc1c67023971741578f9d66910160f932ef96268a7bd5bf356b85b2fd91dd64e55106bf12ac51cf0
+  data.tar.gz: 9b8375989b80dc92c21a64e7db85df2450e8805efd81c35485a5aa546f7708c1d128e132cedf1b7e0edc0b9cc3e74acba9f1c8f013c3c40c4d463a6685df1f7c

data/bin/workerholic-web

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require_relative '../web/application'
+require_relative '../lib/workerholic/web/application'
 
 WorkerholicWeb.run!
-

data/lib/workerholic/job_processor.rb

@@ -16,7 +16,7 @@ module Workerholic
         job.statistics.completed_at = Time.now.to_f
 
         StatsStorage.save_job('completed_jobs', job)
-        StatsStorage.update_historical_stats('completed_jobs', job.klass.name)
+        StatsStorage.update_historical_stats('completed_jobs', job.klass.to_s)
 
         # @logger.info("Completed: your job from class #{job.klass} was completed on #{job.statistics.completed_at}.")
       rescue Exception => e

data/lib/workerholic/version.rb

@@ -1,3 +1,3 @@
 module Workerholic
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/{web → lib/workerholic/web}/application.rb

@@ -1,14 +1,18 @@
-$LOAD_PATH << __dir__ + '/../lib'
+$LOAD_PATH << __dir__ + '/../..'
 require 'sinatra/base'
 
-require 'sinatra/reloader'
+# require 'sinatra/reloader'
 require 'json'
 require 'workerholic'
 
 class WorkerholicWeb < Sinatra::Base
 
   get '/' do
-    redirect '/overview'
+    if defined? Rails
+      redirect '/workerholic/overview'
+    else
+      redirect '/overview'
+    end
   end
 
   get '/overview' do
@@ -60,6 +64,13 @@ class WorkerholicWeb < Sinatra::Base
     erb :history
   end
 
+  get '/overview-data-on-load' do
+    JSON.generate({
+      completed_jobs: Workerholic::StatsAPI.job_statistics_history('completed_jobs'),
+      failed_jobs: Workerholic::StatsAPI.job_statistics_history('failed_jobs')
+    })
+  end
+
   get '/overview-data' do
     JSON.generate({
       completed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'completed_jobs', count_only: true} ),
@@ -68,6 +79,7 @@ class WorkerholicWeb < Sinatra::Base
       scheduled_jobs: Workerholic::StatsAPI.scheduled_jobs( { count_only: true }),
       workers_count: Workerholic.workers_count,
       memory_usage: Workerholic::StatsAPI.process_stats,
+      completed_jobs_per_second: Workerholic::StatsAPI.job_statistics_history('completed_jobs'),
     })
   end
 

data/{web → lib/workerholic/web}/public/javascripts/application.js

@@ -5,8 +5,10 @@ var App = {
   jobsCompletedPerSecondHistory: [],
   totalMemoryHistory: [],
   maxTime: 240,
+  pollingInterval: 10,
+  chartFont: 'arial',
   freshDataCount: function() {
-    return (this.maxTime / 5) + 1;
+    return (this.maxTime / (this.pollingInterval) ) + 1;
   },
   tab: null,
   removeStaleData: function() {
@@ -32,7 +34,7 @@ var App = {
   },
   getOverviewData: function() {
     $.ajax({
-      url: '/overview-data',
+      url: 'overview-data',
       context: this,
       success: function(data) {
         var deserializedData = JSON.parse(data);
@@ -56,20 +58,21 @@ var App = {
         var memoryUsage = deserializedData.memory_usage;
         var totalMemoryUsage = 0;
 
+        $('.removable').remove();
+
         for (id in memoryUsage) {
           totalMemoryUsage = totalMemoryUsage + parseInt(memoryUsage[id]);
-          if ($('#process_' + id).length === 1) {
-            $('#process_' + id).text(parseInt(memoryUsage[id]) / 1000 + ' MB');
-          } else {
-            $('.nested').last().after("<tr class='nested'><td>" + id + "</td><td id='process_" + id + "''>" + memoryUsage[id] + "</td></tr>")
-          }
+          $('.nested').last().after("<tr class='nested removable'><td>" + id + "</td><td id='process_" + id + "'" + "class='process_memory'" + ">" + memoryUsage[id] / 1000 + ' MB' + "</td></tr>")
         }
 
         this.queuedJobsCountHistory.unshift(queuedJobsCount);
         this.failedJobsCountHistory.unshift(failedJobsCount);
         this.jobsCompletedHistory.unshift(completedJobs);
         this.totalMemoryHistory.unshift(totalMemoryUsage / 1000);
-        this.jobsCompletedPerSecondHistory.unshift((this.jobsCompletedHistory[0] - this.jobsCompletedHistory[1]) / 5 || 0);
+
+        for (var i = 0; i < this.freshDataCount(); i++) {
+          this.jobsCompletedPerSecondHistory[i] = (parseInt(deserializedData.completed_jobs_per_second[i]) / 10 || 0);
+        }
 
         this.removeStaleData();
         this.drawChart();
@@ -86,7 +89,7 @@ var App = {
   },
   getQueueData: function() {
     $.ajax({
-      url: '/queues-data',
+      url: 'queues-data',
       success: function(data) {
         var deserializedData = JSON.parse(data);
         var queuedJobs = deserializedData.queued_jobs;
@@ -104,7 +107,7 @@ var App = {
   },
   getDetailData: function() {
     $.ajax({
-      url: '/details-data',
+      url: 'details-data',
       success: function(data) {
         var deserializedData = JSON.parse(data);
         var completedJobs = deserializedData.completed_jobs;
@@ -143,7 +146,7 @@ var App = {
     });
 
     $.ajax({
-      url: '/historic-data',
+      url: 'historic-data',
       data: {
         days: days,
         className: className,
@@ -154,6 +157,31 @@ var App = {
       }.bind(this)
     })
   },
+  getHistoricalOverviewData: function() {
+    $.ajax({
+      url: 'overview-data-on-load',
+      dataType: 'json',
+      success: function(data) {
+        for (var i = 0; i < this.freshDataCount(); i++) {
+          this.jobsCompletedPerSecondHistory[i] = (parseInt(data['completed_jobs'][i]) / 10 || 0);
+        }
+
+        for (var i = 0; i < this.freshDataCount(); i++) {
+          this.failedJobsCountHistory.push(parseInt(data['failed_jobs'][i]) || 0);
+        }
+
+        for (var i = 0; i < this.freshDataCount(); i++) {
+          this.queuedJobsCountHistory.push(0);
+        }
+
+        for (var i = 0; i < this.freshDataCount(); i++) {
+          this.totalMemoryHistory.push(0);
+        }
+
+        this.drawChart();
+      }.bind(this)
+    })
+  },
   drawChart: function() {
     var processedJobsChart = new CanvasJS.Chart('jobs_processed_container', {
       title: {
@@ -162,6 +190,8 @@ var App = {
         fontSize: 24,
       },
       axisX: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         reversed: true,
         gridColor: 'Silver',
         tickColor: 'silver',
@@ -174,13 +204,15 @@ var App = {
       },
       theme: "theme2",
       axisY: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         gridColor: "Silver",
         tickColor: "silver",
         title: 'Jobs per second',
       },
       data: [{
         type: "line",
-        showInLegend: true,
+        showInLegend: false,
         name: "Jobs completed",
         color: "blue",
         markerType: 'circle',
@@ -196,6 +228,8 @@ var App = {
         fontSize: 24,
       },
       axisX: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         reversed: true,
         gridColor: 'Silver',
         tickColor: 'silver',
@@ -209,13 +243,15 @@ var App = {
       },
       theme: "theme2",
       axisY: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         gridColor: "Silver",
         tickColor: "silver",
         title: 'Jobs'
       },
       data: [{
         type: "line",
-        showInLegend: true,
+        showInLegend: false,
         lineThickness: 6,
         name: "Queued Jobs",
         markerType: "circle",
@@ -231,6 +267,8 @@ var App = {
         fontSize: 24,
       },
       axisX: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         reversed: true,
         gridColor: 'Silver',
         tickColor: 'silver',
@@ -244,13 +282,15 @@ var App = {
       },
       theme: "theme2",
       axisY: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         gridColor: "Silver",
         tickColor: "silver",
         title: 'Jobs'
       },
       data: [{
           type: "line",
-          showInLegend: true,
+          showInLegend: false,
           name: "Failed Jobs",
           color: "#20B2AA",
           markerType: 'circle',
@@ -267,6 +307,8 @@ var App = {
         fontSize: 24,
       },
       axisX: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         reversed: true,
         gridColor: 'Silver',
         tickColor: 'silver',
@@ -280,13 +322,15 @@ var App = {
       },
       theme: "theme2",
       axisY: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         gridColor: "Silver",
         tickColor: "silver",
         title: 'Memory (mb)'
       },
       data: [{
         type: "line",
-        showInLegend: true,
+        showInLegend: false,
         name: "Memory usage",
         color: "#20B2AA",
         markerType: 'circle',
@@ -308,7 +352,8 @@ var App = {
         fontSize: 24,
       },
       axisX: {
-        // reversed: true,
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         gridColor: 'Silver',
         tickColor: 'silver',
         animationEnabled: true,
@@ -320,13 +365,15 @@ var App = {
       },
       theme: "theme2",
       axisY: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         gridColor: "Silver",
         tickColor: "silver",
         title: 'Jobs'
       },
       data: [{
         type: "line",
-        showInLegend: true,
+        showInLegend: false,
         name: "Completed Job for " + className,
         color: "#20B2AA",
         markerType: 'circle',
@@ -343,6 +390,8 @@ var App = {
         fontSize: 24,
       },
       axisX: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         gridColor: 'Silver',
         tickColor: 'silver',
         animationEnabled: true,
@@ -354,13 +403,15 @@ var App = {
       },
       theme: "theme2",
       axisY: {
+        labelFontFamily: this.chartFont,
+        titleFontFamily: this.chartFont,
         gridColor: "Silver",
         tickColor: "silver",
         title: 'Jobs'
       },
       data: [{
         type: "line",
-        showInLegend: true,
+        showInLegend: false,
         name: "Failed Jobs for " + className,
         color: "#20B2AA",
         markerType: 'circle',
@@ -388,7 +439,7 @@ var App = {
     var data = [];
 
     for (var i = 0; i <= count; i++) {
-      var point = { x: (i * 5).toString(), y: array[i] };
+      var point = { x: (i * this.pollingInterval).toString(), y: array[i] };
       data.push(point);
     }
 
@@ -411,23 +462,24 @@ var App = {
   },
   pollData: function(tab) {
     if (tab === 'overview') {
+      this.getHistoricalOverviewData();
       this.getOverviewData();
 
       setInterval(function() {
         this.getOverviewData();
-      }.bind(this), 5000);
+      }.bind(this), this.pollingInterval * 1000);
     }
 
     if (tab === 'queues') {
       setInterval(function() {
         this.getQueueData();
-      }.bind(this), 5000);
+      }.bind(this), this.pollingInterval * 1000);
     }
 
     if (tab === 'details') {
       setInterval(function() {
         this.getDetailData();
-      }.bind(this), 5000);
+      }.bind(this), this.pollingInterval * 1000);
     }
 
     if (tab === 'history') {

data/{web → lib/workerholic/web}/public/stylesheets/application.css

@@ -70,7 +70,6 @@ nav a:hover {
 }
 
 .nested th, .nested td {
-  display: none;
   padding-left: 50px
 }
 

data/{web → lib/workerholic/web}/views/overview.erb

@@ -39,22 +39,22 @@
       <th>Memory Usage</th>
     </tr>
     <% @processes.each do |id, memory| %>
-      <tr class='nested'>
+      <tr class='nested removable'>
         <td><%= id %></td>
-        <td id='process_<%= id %>'></td>
+        <td id='process_<%= id %>' class='process_memory'></td>
       </tr>
     <% end %>
   </tbody>
 </table>
 
-<div id="queued_jobs_container" class="chart">
+<div id="jobs_processed_container" class="chart">
 </div>
 
-<div id="failed_jobs_container" class="chart">
+<div id="total_memory_container" class="chart">
 </div>
 
-<div id="jobs_processed_container" class="chart">
+<div id="queued_jobs_container" class="chart">
 </div>
 
-<div id="total_memory_container" class="chart">
+<div id="failed_jobs_container" class="chart">
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workerholic
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Antoine Leclercq
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -141,6 +141,18 @@ files:
 - lib/workerholic/statistics_storage.rb
 - lib/workerholic/storage.rb
 - lib/workerholic/version.rb
+- lib/workerholic/web/application.rb
+- lib/workerholic/web/public/javascripts/application.js
+- lib/workerholic/web/public/stylesheets/application.css
+- lib/workerholic/web/public/stylesheets/whitespace-reset.css
+- lib/workerholic/web/views/details.erb
+- lib/workerholic/web/views/failed.erb
+- lib/workerholic/web/views/history.erb
+- lib/workerholic/web/views/layout.erb
+- lib/workerholic/web/views/overview.erb
+- lib/workerholic/web/views/queues.erb
+- lib/workerholic/web/views/scheduled.erb
+- lib/workerholic/web/views/workers.erb
 - lib/workerholic/worker.rb
 - lib/workerholic/worker_balancer.rb
 - pkg/workerholic-0.0.14.gem
@@ -163,18 +175,6 @@ files:
 - spec/storage_spec.rb
 - spec/worker_balancer_spec.rb
 - spec/worker_spec.rb
-- web/application.rb
-- web/public/javascripts/application.js
-- web/public/stylesheets/application.css
-- web/public/stylesheets/whitespace-reset.css
-- web/views/details.erb
-- web/views/failed.erb
-- web/views/history.erb
-- web/views/layout.erb
-- web/views/overview.erb
-- web/views/queues.erb
-- web/views/scheduled.erb
-- web/views/workers.erb
 - workerholic.gemspec
 homepage: https://github.com/workerholic/workerholic
 licenses: