workerholic 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdbe7b74f8270c226d2601c566f6a0417a2bc1b5
-  data.tar.gz: b9e159ae9b745c367f79ac92b11711e8650946a6
+  metadata.gz: 86a4ad33857310f6ae88067255e2ec98f0290e31
+  data.tar.gz: 0047fd7373d52d09e8d93a7f297ef9e9143657f9
 SHA512:
-  metadata.gz: 2f500485b1718548a16660432deb738ccd9eaa3d8ce29dc407c839d3c4201f8ac13babbf3f7c5d2c7158fbd6880d60a50ab0e19cbd29b058e3e8f210dcc07a8a
-  data.tar.gz: 14360fab31e56ee4f37d4a5db775f7ad8bdfdb47f26e55ff09aa6549618df5207506021878afcf7a9b68254114879fd1e82193db488f055fc727ec07dd2785be
+  metadata.gz: 2eccb9b6cccbec30b2c2c67232b6137fd8028b84a90dedc224698580bd3f4723785d617f00a9c7b9af338c611ba60ef1ef97dfbf1f4a2bd554a298c5e6bed026
+  data.tar.gz: d738cd59fefb6ef6abaff08ed10d07a5397a80c18db3b093aefb1fda4cb61f67f26084def316c955ad67c83161777308406215de653a0c3b973cf637f778b26b

data/lib/workerholic/job_processor.rb

@@ -10,21 +10,22 @@ module Workerholic
     def process
       job = JobSerializer.deserialize(serialized_job)
 
-      begin
-        job.statistics.started_at = Time.now.to_f
-        job_result = job.perform
-        job.statistics.completed_at = Time.now.to_f
+      job.statistics.started_at = Time.now.to_f
+      job_result = job.perform
+      job.statistics.completed_at = Time.now.to_f
 
-        StatsStorage.save_job('completed_jobs', job)
-        StatsStorage.update_historical_stats('completed_jobs', job.klass.to_s)
+      StatsStorage.save_job('completed_jobs', job)
+      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
-        job.statistics.errors.push([e.class, e.message])
-        retry_job(job, e)
+      # @logger.info("Completed: your job from class #{job.klass} was completed on #{job.statistics.completed_at}.")
+
+      # forces AR to release idle connections back to the pool
+      ActiveRecord::Base.clear_active_connections! if defined?(Rails)
 
-      end
       job_result
+    rescue Exception => e
+      job.statistics.errors.push([e.class, e.message])
+      retry_job(job, e)
     end
 
     private

data/lib/workerholic/version.rb

@@ -1,3 +1,3 @@
 module Workerholic
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

data/workerholic.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/workerholic/workerholic'
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split("\n")
+  gem.files         = `git ls-files | grep -Ev '^(app_test|demo_app)'`.split("\n")
   gem.test_files    = `git ls-files -- spec/*`.split("\n")
   gem.executables   = ['workerholic', 'workerholic-web']
   gem.require_paths = ['lib']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workerholic
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Antoine Leclercq
@@ -117,86 +117,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app_test/bm.rb
-- app_test/job_test.rb
-- app_test/run.rb
 - bin/workerholic
 - bin/workerholic-web
-- demo_app/.gitignore
-- demo_app/Gemfile
-- demo_app/README.md
-- demo_app/Rakefile
-- demo_app/app/assets/config/manifest.js
-- demo_app/app/assets/images/.keep
-- demo_app/app/assets/javascripts/application.js
-- demo_app/app/assets/javascripts/cable.js
-- demo_app/app/assets/javascripts/channels/.keep
-- demo_app/app/assets/stylesheets/application.css
-- demo_app/app/assets/stylesheets/main.scss
-- demo_app/app/channels/application_cable/channel.rb
-- demo_app/app/channels/application_cable/connection.rb
-- demo_app/app/controllers/application_controller.rb
-- demo_app/app/controllers/concerns/.keep
-- demo_app/app/controllers/jobs_controller.rb
-- demo_app/app/helpers/application_helper.rb
-- demo_app/app/jobs/application_job.rb
-- demo_app/app/jobs/cpu_bound_job.rb
-- demo_app/app/jobs/io_bound_job.rb
-- demo_app/app/jobs/non_blocking_job.rb
-- demo_app/app/mailers/application_mailer.rb
-- demo_app/app/models/application_record.rb
-- demo_app/app/models/concerns/.keep
-- demo_app/app/views/jobs/_actions_form.html.slim
-- demo_app/app/views/jobs/_footer.html.slim
-- demo_app/app/views/jobs/_header.html.slim
-- demo_app/app/views/jobs/index.html.slim
-- demo_app/app/views/layouts/application.html.slim
-- demo_app/app/views/layouts/mailer.html.erb
-- demo_app/app/views/layouts/mailer.text.erb
-- demo_app/bin/bundle
-- demo_app/bin/rails
-- demo_app/bin/rake
-- demo_app/bin/setup
-- demo_app/bin/spring
-- demo_app/bin/update
-- demo_app/bin/yarn
-- demo_app/config.ru
-- demo_app/config/application.rb
-- demo_app/config/boot.rb
-- demo_app/config/cable.yml
-- demo_app/config/database.yml
-- demo_app/config/environment.rb
-- demo_app/config/environments/development.rb
-- demo_app/config/environments/production.rb
-- demo_app/config/environments/test.rb
-- demo_app/config/initializers/application_controller_renderer.rb
-- demo_app/config/initializers/assets.rb
-- demo_app/config/initializers/backtrace_silencers.rb
-- demo_app/config/initializers/cookies_serializer.rb
-- demo_app/config/initializers/filter_parameter_logging.rb
-- demo_app/config/initializers/inflections.rb
-- demo_app/config/initializers/mime_types.rb
-- demo_app/config/initializers/wrap_parameters.rb
-- demo_app/config/locales/en.yml
-- demo_app/config/puma.rb
-- demo_app/config/routes.rb
-- demo_app/config/secrets.yml
-- demo_app/config/spring.rb
-- demo_app/db/schema.rb
-- demo_app/db/seeds.rb
-- demo_app/lib/assets/.keep
-- demo_app/lib/tasks/.keep
-- demo_app/log/.keep
-- demo_app/package.json
-- demo_app/public/404.html
-- demo_app/public/422.html
-- demo_app/public/500.html
-- demo_app/public/apple-touch-icon-precomposed.png
-- demo_app/public/apple-touch-icon.png
-- demo_app/public/favicon.ico
-- demo_app/public/robots.txt
-- demo_app/tmp/.keep
-- demo_app/vendor/.keep
 - lib/workerholic.rb
 - lib/workerholic/adapters/active_job_adapter.rb
 - lib/workerholic/cli.rb
@@ -231,7 +153,6 @@ files:
 - lib/workerholic/worker.rb
 - lib/workerholic/worker_balancer.rb
 - logos.png
-- pkg/workerholic-0.0.14.gem
 - spec/helpers/helper_methods.rb
 - spec/helpers/job_tests.rb
 - spec/integration/dequeuing_and_job_processing_spec.rb

data/app_test/bm.rb

@@ -1,45 +0,0 @@
-require 'benchmark'
-
-class FibCruncher
-  def self.perform(n)
-    a, b = 0, 1
-    while b < n
-      a, b = b, a + b
-    end
-    b
-  end
-end
-
-def run_benchmark(n)
-  Benchmark.bm do |r|
-    r.report do
-      n.times do
-        FibCruncher.perform(1_000)
-      end
-    end
-
-    r.report do
-      n.times do
-        FibCruncher.perform(1_000_00)
-      end
-    end
-
-    r.report do
-      n.times do
-        FibCruncher.perform(1_000_000)
-      end
-    end
-
-    r.report do
-      n.times do
-        FibCruncher.perform(1_000_000_0)
-      end
-    end
-
-    r.report do
-      n.times do
-        FibCruncher.perform(1_000_000_000)
-      end
-    end
-  end
-end

data/app_test/job_test.rb

@@ -1,138 +0,0 @@
-# $LOAD_PATH.unshift(__dir__ + '/../lib')
-require 'workerholic'
-require 'prime'
-
-class JobTestFast
-  include Workerholic::Job
-  job_options queue_name: 'job_fast'
-
-  def perform(str, num)
-    str
-  end
-end
-
-class JobTestSlow
-  include Workerholic::Job
-  job_options queue_name: 'job_slow'
-
-  def perform(str, num)
-    sleep(0.5)
-  end
-end
-
-class ThreadKiller
-  include Workerholic::Job
-
-  def perform(string, n)
-    Thread.main.kill
-  end
-end
-
-class LargeArg
-  include Workerholic::Job
-
-  def perform(arr, n)
-  end
-end
-
-class ManyArgs
-  include Workerholic::Job
-
-  def perform(n, *args)
-  end
-end
-
-# A CPU-blocking operation
-class HeavyCalculation
-  include Workerholic::Job
-
-  def perform(arr_size)
-    #arr = bubble_sort(arr)
-    generate_large_array(arr_size)
-  end
-
-  def generate_large_array(arr_size)
-    result = []
-    arr_size.times do
-      result << rand(50 ** 10)
-    end
-
-    result
-  end
-
-  def bubble_sort(array)
-    return array if array.size <= 1
-
-    unsorted = true
-
-    while unsorted do
-      unsorted = false
-      0.upto(array.size-2) do |i|
-        if array[i] > array[i+1]
-          array[i], array[i+1] = array[i+1], array[i]
-          unsorted = true
-        end
-      end
-    end
-
-    array
-  end
-end
-
-class GetPrimes
-  include Workerholic::Job
-
-  def perform(n, max)
-    Prime.each(max) do |prime|
-      prime
-    end
-  end
-end
-
-class FutureJob
-  include Workerholic::Job
-
-  def perform(n)
-    n
-  end
-end
-
-class FutureJobWithQueue
-  include Workerholic::Job
-  job_options queue_name: 'specific_queue_for_delayed_jobs'
-
-  def perform(n)
-    n
-  end
-end
-
-class FailedJob
-  include Workerholic::Job
-
-  def perform(n)
-    raise Exception
-  end
-end
-
-class FailedJobWithQueue
-  include Workerholic::Job
-  job_options queue_name: 'specific_queue_for_failed_jobs'
-
-  def perform(n)
-    raise Exception
-  end
-end
-
-class FibCruncher
-  include Workerholic::Job
-
-  def perform(n)
-    a, b = 0, 1
-
-    while b < n
-      a, b = b, a + b
-    end
-
-    puts b
-  end
-end

data/app_test/run.rb

@@ -1,95 +0,0 @@
-require_relative 'job_test'
-
-module TestRunner
-  def self.non_blocking(num_of_cycles)
-    num_of_cycles.times do |n|
-       JobTestFast.new.perform_async('NONBLOCKING', n)
-    end
-  end
-
-  def self.blocking(num_of_cycles)
-    num_of_cycles.times do |n|
-      JobTestSlow.new.perform_async('BLOCKING', n)
-    end
-  end
-
-  def self.thread_killer(num_of_cycles)
-    num_of_cycles.times do |n|
-      ThreadKiller.new.perform_async('Kill', n)
-    end
-  end
-
-  def self.large_arg(num_of_cycles)
-    arg = Array.new(10000, 'string')
-
-    num_of_cycles.times do |n|
-      LargeArg.new.perform_async(arg, n)
-    end
-  end
-
-  def self.generate_array(num_of_cycles, array_size)
-    num_of_cycles.times do
-      HeavyCalculation.new.perform_async(array_size)
-    end
-  end
-
-  def self.many_args(num_of_cycles)
-    num_of_cycles.times do |n|
-      ManyArgs.new.perform_async(n, [1, 2, 3], { key: 'value'}, :symb, 'string', 22, false)
-    end
-  end
-
-  def self.calculate_primes(num_of_cycles)
-    num_of_cycles.times do |n|
-      GetPrimes.new.perform_async(n, 10)
-    end
-  end
-
-  def self.enqueue_delayed(num_of_cycles)
-    num_of_cycles.times do |n|
-      FutureJob.new.perform_delayed(10, n)
-    end
-  end
-
-  def self.enqueue_delayed_with_queue(num_of_cycles)
-    num_of_cycles.times do |n|
-      FutureJobWithQueue.new.perform_delayed(10, n)
-    end
-  end
-
-  def self.failed_jobs(num_of_cycles)
-    num_of_cycles.times do |n|
-      FailedJob.new.perform_async(n)
-    end
-  end
-
-  def self.failed_jobs_with_queue(num_of_cycles)
-    num_of_cycles.times do |n|
-      FailedJobWithQueue.new.perform_async(n)
-    end
-  end
-
-  def self.multiple_processes(num_of_proc, jobs)
-    pids = (1..num_of_proc).to_a.map do
-      fork do
-        jobs.each do |job|
-          TestRunner.send(:job[0], job[1..-1])
-        end
-
-        exit
-      end
-    end
-
-    pids.each { |pid| Process.wait(pid) }
-  end
-
-  def self.fibonacci_cruncher(num_of_cycles)
-    num_of_cycles.times do |n|
-      FibCruncher.new.perform_async(1_000)
-    end
-  end
-end
-
-TestRunner.non_blocking(10000)
-TestRunner.blocking(10000)
-TestRunner.fibonacci_cruncher(10000)

data/demo_app/.gitignore

@@ -1,19 +0,0 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-!/log/.keep
-!/tmp/.keep
-
-/node_modules
-/yarn-error.log
-
-.byebug_history

data/demo_app/Gemfile

@@ -1,40 +0,0 @@
-source 'https://rubygems.org'
-
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
-
-gem 'rails', '~> 5.1.3'
-gem 'pg', '~> 0.18'
-gem 'puma', '~> 3.7'
-gem 'sass-rails', '~> 5.0'
-gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails', '~> 4.2'
-#gem 'turbolinks', '~> 5'
-gem 'jbuilder', '~> 2.5'
-gem 'slim-rails'
-gem 'http'
-gem 'workerholic'
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
-  # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '~> 2.13'
-  gem 'selenium-webdriver'
-end
-
-group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
-  gem 'pry-byebug'
-  gem 'listen', '>= 3.0.5', '< 3.2'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-#  gem 'spring'
-#  gem 'spring-watcher-listen', '~> 2.0.0'
-end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

data/demo_app/README.md

@@ -1,24 +0,0 @@
-# README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...

data/demo_app/Rakefile

@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require_relative 'config/application'
-
-Rails.application.load_tasks

data/demo_app/app/assets/config/manifest.js

@@ -1,3 +0,0 @@
-//= link_tree ../images
-//= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css

data/demo_app/app/assets/javascripts/application.js

@@ -1,14 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
-// vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require rails-ujs
-//= require_tree .

data/demo_app/app/assets/javascripts/cable.js

@@ -1,13 +0,0 @@
-// Action Cable provides the framework to deal with WebSockets in Rails.
-// You can generate new channels where WebSocket features live using the `rails generate channel` command.
-//
-//= require action_cable
-//= require_self
-//= require_tree ./channels
-
-(function() {
-  this.App || (this.App = {});
-
-  App.cable = ActionCable.createConsumer();
-
-}).call(this);

data/demo_app/app/assets/stylesheets/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
- * vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */