sidejobs 4.0.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4cf6173fbef33ca84efaf2ed476035706ab71d3
-  data.tar.gz: 4e4d08e0ab018af12efe024ec1b1f3504b9efdaa
+  metadata.gz: 576d715438f5bf28ed6f478ba5d81a47bf737907
+  data.tar.gz: dccae5be6356b8aac334dc6a77a4f46fd418d4e1
 SHA512:
-  metadata.gz: 05937dadb1ed74f1f361f61860b9c66db7be132d3ae7b83ec464008f5120bb83a5208b36e09b8636cdd9352450e679458cc613b5f39750a0682a92a24f022cba
-  data.tar.gz: a50c5625bbe904b1fdef3a27ec1a7c846c6be3cb8ada680b3a52041a70c3cc65ce7a5ddcfb694e91f90eb7f50de865f07f226b60ca069818771477906cec9302
+  metadata.gz: 6c1be39cf38b2c6bc18eaadcc211ae732e3e8c1c4c710c551ca8514d7ae6162a9868bda36a49875d06bcd0a3d5a8bfb12c46faa9a677d34a9c103cab589390ed
+  data.tar.gz: 715e43fbf5241459c37801b5a4d43a8c1b4ac1f235da2451d512eb78482a573dcb0f51f62c2547bc62805565cf588feebf815aa9040d76c389a1196cd7ba9fd6

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Mathías Montossi
+Copyright 2017 Museways
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/sidejobs.svg)](http://badge.fury.io/rb/sidejobs)
-[![Code Climate](https://codeclimate.com/github/mmontossi/sidejobs/badges/gpa.svg)](https://codeclimate.com/github/mmontossi/sidejobs)
-[![Build Status](https://travis-ci.org/mmontossi/sidejobs.svg)](https://travis-ci.org/mmontossi/sidejobs)
-[![Dependency Status](https://gemnasium.com/mmontossi/sidejobs.svg)](https://gemnasium.com/mmontossi/sidejobs)
+[![Code Climate](https://codeclimate.com/github/museways/sidejobs/badges/gpa.svg)](https://codeclimate.com/github/museways/sidejobs)
+[![Build Status](https://travis-ci.org/museways/sidejobs.svg)](https://travis-ci.org/museways/sidejobs)
+[![Dependency Status](https://gemnasium.com/museways/sidejobs.svg)](https://gemnasium.com/museways/sidejobs)
 
 # Sidejobs
 
@@ -89,11 +89,11 @@ Sidejobs::Job.failing.where('attempts > ?', 3).destroy_all
 
 Any issue, pull request, comment of any kind is more than welcome!
 
-I will mainly ensure compatibility to PostgreSQL, AWS, Redis, Elasticsearch, FreeBSD and Memcached. 
+I will mainly ensure compatibility to last versions of Ruby, Rails and PostgreSQL. 
 
 ## Credits
 
-This gem is maintained and funded by [mmontossi](https://github.com/mmontossi).
+This gem is maintained and funded by [museways](https://github.com/museways).
 
 ## License
 

data/Rakefile

@@ -4,16 +4,14 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
-  t.warning = false
 end
 
 task default: :test

data/lib/sidejobs.rb

@@ -1,5 +1,6 @@
 require 'sidejobs/extensions/active_job/queue_adapter'
 require 'sidejobs/configuration'
+require 'sidejobs/loggable'
 require 'sidejobs/daemon'
 require 'sidejobs/job'
 require 'sidejobs/processor'
@@ -19,7 +20,7 @@ module Sidejobs
     end
 
     def logger
-      @logger ||= Logger.new(Rails.root.join('log/sidejobs.log'))
+      @logger ||= ActiveSupport::Logger.new(Rails.root.join('log/sidejobs.log'))
     end
 
     def configuration

data/lib/sidejobs/daemon.rb

@@ -1,9 +1,6 @@
 module Sidejobs
   class Daemon
-
-    def initialize
-      @stopping = false
-    end
+    include Loggable
 
     def running?
       if pid
@@ -20,24 +17,19 @@ module Sidejobs
 
     def start
       unless running?
-        daemonize
-        write_pid
-        trap_signals
-        process
+        spawn
       end
     end
 
     def stop
       if running?
         Process.kill :TERM, pid
-        delete_pid
       end
     end
 
     def restart
       if running?
-        stop
-        start
+        Process.kill :HUP, pid
       else
         start
       end
@@ -47,31 +39,30 @@ module Sidejobs
       File.read(pid_path).to_i rescue nil
     end
 
-    def stopping?
-      @stopping == true
-    end
-
     private
 
+    def spawn
+      daemonize
+      write_pid
+      trap_signals
+      process
+    end
+
     def daemonize
-      exit if fork
-      Process.setsid
-      exit if fork
-      Dir.chdir '/'
-      File.umask 0000
-      $stdout.reopen log_path, 'a'
-      $stderr.reopen $stdout
-      $stdout.sync = true
+      Process.daemon
     end
 
     def trap_signals
       trap :TERM do
-        @stopping = true
+        @signal = :stop
+      end
+      trap :HUP do
+        @signal = :restart
       end
     end
 
     def delete_pid
-      File.unlink pid_path
+      FileUtils.rm_rf pid_path
     end
 
     def write_pid
@@ -79,25 +70,36 @@ module Sidejobs
       File.write pid_path, Process.pid
     end
 
-    def log_path
-      Rails.root.join 'log/sidejobs.log'
-    end
-
     def pid_path
-      Rails.root.join 'tmp/pids/sidejobs.pid'
+      Rails.root.join 'tmp/sidejobs.pid'
     end
 
     def processor
       @processor ||= Processor.new
     end
 
+    def handle_signal
+      case @signal
+      when :stop
+        delete_pid
+      when :restart
+        @signal = nil
+        spawn
+      end
+    end
+
+    def signal_received?
+      @signal.present?
+    end
+
     def process
-      Sidejobs.logger.info 'Starting'
-      until stopping? do
+      logger.info "Started #{pid} at #{Time.zone.now}"
+      until signal_received? do
         processor.process
         sleep Sidejobs.configuration.sleep_delay
       end
-      Sidejobs.logger.info 'Stopping'
+      logger.info "Stopped #{pid} at #{Time.zone.now}"
+      handle_signal
     end
 
   end

data/lib/sidejobs/extensions/active_job/queue_adapter.rb

@@ -3,43 +3,41 @@ module Sidejobs
     module ActiveJob
       module QueueAdapters
         class SidejobsAdapter
-          class << self
 
-            def enqueue(job)
-              Sidejobs.queue.add(
-                job.serialize,
-                queue: job.queue_name,
-                priority: calculate_priority(job.queue_name)
-              )
-            end
+          def enqueue(job)
+            Sidejobs.queue.add(
+              job.serialize,
+              queue: job.queue_name,
+              priority: calculate_priority(job.queue_name)
+            )
+          end
 
-            def enqueue_at(job, timestamp)
-              Sidejobs.queue.add(
-                job.serialize,
-                queue: job.queue_name,
-                priority: calculate_priority(job.queue_name),
-                schedule_at: Time.at(timestamp)
-              )
-            end
+          def enqueue_at(job, timestamp)
+            Sidejobs.queue.add(
+              job.serialize,
+              queue: job.queue_name,
+              priority: calculate_priority(job.queue_name),
+              schedule_at: Time.at(timestamp)
+            )
+          end
 
-            private
+          private
 
-            def calculate_priority(queue)
-              case queue
-              when 'mailers'
-                80
-              when 'high_priority'
-                60
-              when 'default'
-                40
-              when 'low_priority'
-                20
-              else
-                0
-              end
+          def calculate_priority(queue)
+            case queue
+            when 'mailers'
+              80
+            when 'high_priority'
+              60
+            when 'default'
+              40
+            when 'low_priority'
+              20
+            else
+              0
             end
-
           end
+
         end
       end
     end

data/lib/sidejobs/loggable.rb

@@ -0,0 +1,7 @@
+module Sidejobs
+  module Loggable
+
+    delegate :logger, to: Sidejobs
+
+  end
+end

data/lib/sidejobs/processor.rb

@@ -1,22 +1,17 @@
 module Sidejobs
   class Processor
+    include Loggable
 
     def process
-      original_logger = ActiveRecord::Base.logger
-      ActiveRecord::Base.logger = Sidejobs.logger
       Sidejobs.queue.fetch.each do |job|
-        Sidejobs.logger.info "Processing #{job.data['job_class']} ##{job.id} attempt #{job.attempts+1} at #{job.queue}"
         job.update status: 'processing', processed_at: Time.now, attempts: job.attempts+1
         begin
           ActiveJob::Base.execute job.data
           job.update status: 'complete', completed_at: Time.now
-          Sidejobs.logger.info 'Done'
         rescue => exception
           job.update status: 'failing', failed_at: Time.now, error: exception.message
-          Sidejobs.logger.info "Error: #{exception.message}"
         end
       end
-      ActiveRecord::Base.logger = original_logger
     end
 
   end

data/lib/sidejobs/queue.rb

@@ -3,7 +3,7 @@ module Sidejobs
 
     def add(data, options={})
       Job.create(
-        data: data.to_json,
+        data: data,
         queue: (options[:queue] || 'default'),
         priority: (options[:priority] || 0),
         scheduled_at: options[:schedule_at]

data/lib/sidejobs/version.rb

@@ -1,5 +1,5 @@
 module Sidejobs
 
-  VERSION = '4.0.0.2'
+  VERSION = '5.1.0'
 
 end

metadata

@@ -1,66 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: sidejobs
 version: !ruby/object:Gem::Version
-  version: 4.0.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - mmontossi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 description: Versatile async database based jobs for rails.
 email:
-- mmontossi@gmail.com
+- hi@museways.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -76,64 +70,13 @@ files:
 - lib/sidejobs/daemon.rb
 - lib/sidejobs/extensions/active_job/queue_adapter.rb
 - lib/sidejobs/job.rb
+- lib/sidejobs/loggable.rb
 - lib/sidejobs/processor.rb
 - lib/sidejobs/queue.rb
 - lib/sidejobs/railtie.rb
 - lib/sidejobs/version.rb
 - lib/tasks/sidejobs.rake
-- test/daemon_test.rb
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/jobs/charge_subscriptions_job.rb
-- test/dummy/app/jobs/clear_guest_users_job.rb
-- test/dummy/app/jobs/send_newsletters_job.rb
-- test/dummy/app/jobs/share_products_job.rb
-- test/dummy/app/jobs/update_exchanges_job.rb
-- test/dummy/app/mailers/user_mailer.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/user_mailer/invite.text.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/database.yml.travis
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/sidejobs.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20161022211612_create_sidejobs.rb
-- test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/sidejobs.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/generator_test.rb
-- test/processor_test.rb
-- test/queue_test.rb
-- test/test_helper.rb
-homepage: https://github.com/mmontossi/sidejobs
+homepage: https://github.com/museways/sidejobs
 licenses:
 - MIT
 metadata: {}
@@ -145,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -153,60 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Async jobs for rails
-test_files:
-- test/daemon_test.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/jobs/charge_subscriptions_job.rb
-- test/dummy/app/jobs/clear_guest_users_job.rb
-- test/dummy/app/jobs/send_newsletters_job.rb
-- test/dummy/app/jobs/share_products_job.rb
-- test/dummy/app/jobs/update_exchanges_job.rb
-- test/dummy/app/mailers/user_mailer.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/user_mailer/invite.text.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/database.yml.travis
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/sidejobs.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config.ru
-- test/dummy/db/migrate/20161022211612_create_sidejobs.rb
-- test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/sidejobs.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/generator_test.rb
-- test/processor_test.rb
-- test/queue_test.rb
-- test/test_helper.rb
+test_files: []