steve 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ac8bc8cd9c5647e61a09673bcc96fed956fb57
-  data.tar.gz: 552ae88ed5ed4968234701ddc338f4d08bdc9be2
+  metadata.gz: ff4ed0070df9be5041ccf923f6241cd8c484fbd1
+  data.tar.gz: fe44158d942b5ef3bd69f7acafd276bd36d07f42
 SHA512:
-  metadata.gz: 7e7f58a6af65971bd4d64a061617d32925931cf8db09d3ee432ce77711d6cecc17f01dbc8a8061b08ff2ca43b87af31d4e3150629a11772cc4079294777d6c7c
-  data.tar.gz: 2725c97343de78b411c98b4703c1aad5d64dcece8da36c74543e74722b20e70390c19a89e32fcdcc6842157519fba354947c62ec20283838a13e7bab4a300a6f
+  metadata.gz: 4db62a04d2c0c42669cbabeb60716adf504b3943dbc3a8fe36dc6e6e587b06b299c08f5487fb244705e594b9f4f7f06fdcdbd6980c1c901faada4fe331eb8a5b
+  data.tar.gz: 25d9f7681af9ec48b87035baa2a3df3ede024ca806d1f2193197bea1bf22027885cb15c4b5ae6538fef5a9de9583eb96ecccfc5fad5c193c2ba117789149e870

data/lib/active_job/queue_adapters/steve_adapter.rb

@@ -20,4 +20,4 @@ module ActiveJob
 
     end
   end
-end
+end

data/lib/steve.rb

@@ -1,58 +1,58 @@
 module Steve
-  
+
   class << self
-    
+
     ## The default queue for new jobs
     attr_accessor :default_job_queue
-    
+
     ## The default priority for new jobs
-    attr_accessor :default_job_priority    
-    
+    attr_accessor :default_job_priority
+
     ## The name of the table where jobs are stored (default 'jobs')
     attr_accessor :jobs_table_name
 
     ## The name of the table where completed jobs are stored
     attr_accessor :archived_jobs_table_name
-    
+
     ## The period of time to wait before looking for new jobs
     attr_accessor :worker_sleep_time
-    
+
     ## The logger object for all output from steve
     attr_accessor :logger
-    
+
     ## The maximum number of times to retry a job
     attr_accessor :max_job_retries
-    
+
     ## Whether or not jobs should be queued or run in the background
     attr_accessor :run_jobs_in_foreground
-    
+
     ## Proc to run after forking
     attr_accessor :after_job_fork
-    
+
     ## Allow parent process name to be kept
     attr_accessor :keep_parent_process_name
 
     ## Delete jobs after successful completion
     attr_accessor :delete_successful_jobs
-    
+
     ## Return the worker name for this current process/host
     def worker_name
       "host:#{Socket.gethostname} pid:#{Process.pid}" rescue "pid:#{Process.pid}"
     end
-    
+
     ## Set/return the logger object
     def logger
       @logger ||= Logger.new(File.join(Rails.root, 'log', 'jobs.log'))
     end
-    
+
     ## Log a new message
     def log(message)
       message.gsub!(/(\[\d+\])/) { "\e[33m#{$1}\e[0m" }
       logger.info "\e[37m#{Time.now.utc.to_s(:db)}\e[0m #{message}"
     end
-    
+
   end
-  
+
 end
 
 require 'steve/job'

data/lib/steve/interface.rb

@@ -1,21 +1,17 @@
-require 'haml'
-require 'will_paginate/view_helpers'
-require 'will_paginate/view_helpers/link_renderer'
+# require 'haml'
 
 module Steve
   class Interface
-    include WillPaginate::ViewHelpers
-
     def call(env)
       @req = Rack::Request.new(env)
       case env['PATH_INFO'].to_s
       when '/', ''
         [200, {'Content-type' => 'text/html'}, [haml(:index)]]
       when /failed/
-        @jobs = Steve::ArchivedJob.failed.asc.paginate(:page => @req.params['page'], :per_page => 50)
+        @jobs = paginate(Steve::ArchivedJob.failed.asc, :page => @req.params['page'], :per_page => 50)
         [200, {'Content-type' => 'text/html'}, [haml(:failed)]]
       when /completed/
-        @jobs = Steve::ArchivedJob.completed.asc.paginate(:page => @req.params['page'], :per_page => 50)
+        @jobs = paginate(Steve::ArchivedJob.completed.asc, :page => @req.params['page'], :per_page => 50)
         [200, {'Content-type' => 'text/html'}, [haml(:completed)]]
       when /archived\/object/
         @jobs = Steve::ArchivedJob.where(:associated_object_type => @req.params['type'], :associated_object_id => @req.params['id']).order('created_at desc').limit(25)
@@ -44,23 +40,30 @@ module Steve
         else
           [404, {'Content-type' => 'text/plain'}, ["Not found"]]
         end
-        
+
       end
     end
-    
+
     private
-    
+
+    def paginate(collection, options = {})
+      options[:per_page] ||= 50
+      options[:page] ||= 1
+
+      collection.limit(options[:per_page]).offset((options[:page].to_i - 1) * options[:per_page])
+    end
+
     def haml(view_name)
       Haml::Engine.new(File.read(view_path(view_name))).render(self)
     end
-    
+
     def view_path(name)
       File.expand_path(File.join('..', 'interface', 'views', name.to_s + '.haml'), __FILE__)
     end
-    
+
     def static_path(name)
       File.expand_path(File.join('..', 'interface', 'public', name.to_s), __FILE__).gsub(/\.\./, '')
     end
-    
+
   end
 end

data/lib/steve/interface/views/completed.haml

@@ -39,7 +39,5 @@
               %tr
                 %td.none{:colspan => 7} There are no jobs recently completed
 
-      .pagination-details
-        = page_entries_info @jobs
       %p
         %a{:href => "/jobs"} Back to overview

data/lib/steve/interface/views/failed.haml

@@ -12,7 +12,7 @@
       %p
         The jobs listed below have failed to execute recently. You can clear all the jobs using the button below, this will
         remove them from the database and you will not be able to retry once removed.
-      
+
       %table.data
         %thead
           %tr
@@ -37,13 +37,10 @@
                 %code{:style => 'font-size:90%', :title => job.error}= ERB::Util.html_escape(job.error.to_s.split("\n").first)\
               %td
                 %form{:action => "/jobs/retry?id=#{job.id}", :method => :post}
-                  %input{:type => 'submit', :value => 'Retry'} 
+                  %input{:type => 'submit', :value => 'Retry'}
           - if @jobs.empty?
             %tr
               %td.none{:colspan => 6} There are no jobs currently running
-              
-      .pagination-details
-        = page_entries_info @jobs
 
       %p
         %a{:href => "/jobs"} Back to overview

data/lib/steve/job.rb

@@ -3,19 +3,19 @@
 
 module Steve
   class Job
-    
+
     class Delay < StandardError; end
     class Error < StandardError; end
     class Aborted < StandardError; end
-    
+
     attr_reader :job
     attr_reader :params
-    
+
     def initialize(job, params = {})
       @job    = job
       @params = job.params
     end
-    
+
     ## Queue the job
     def self.queue(params = {}, &block)
       if Steve.run_jobs_in_foreground
@@ -27,22 +27,22 @@ module Steve
         QueuedJob.queue(self, params, &block)
       end
     end
-    
+
     ## Live run a job after passing the params
     def self.run(params = {})
       self.new(FakeQueuedJob.new(params)).perform
     end
-    
+
     class FakeQueuedJob
       attr_reader :params
       def initialize(params)
         @params = params
       end
-      
+
       def method_missing(*_)
         true
       end
     end
-    
+
   end
 end

data/lib/steve/queued_job.rb

@@ -2,20 +2,20 @@ require 'stringio'
 
 module Steve
   class QueuedJob < ActiveRecord::Base
-    
+
     ## Set the table name - a migration should be created for this
     self.table_name = Steve.jobs_table_name || 'jobs'
-    
+
     ## Serialize the options
     serialize :params
-    
+
     ## Can belong to another active record object?
     belongs_to :associated_object, :polymorphic => true
-    
+
     ## Scopes
     scope :pending, lambda { where(:status => ['pending', 'delayed']) }
     scope :running, lambda { where(:status => 'running') }
-    
+
     ## Automatically set defaults for new jobs
     before_create do
       self.priority ||= (Steve.default_job_priority || 10)
@@ -23,7 +23,7 @@ module Steve
       self.status   ||= 'pending'
       self.run_at   ||= Time.now.utc
     end
-    
+
     after_save do
       Steve::ArchivedJob.archive_job(self) if self.archive_job?
       true
@@ -40,8 +40,8 @@ module Steve
       block.call(job) if block_given?
       job.save
     end
-    
-    ## Execute a new job from the queue. Returns true if a job was executed, or false if a 
+
+    ## Execute a new job from the queue. Returns true if a job was executed, or false if a
     ## job was not found or we couldn't obtain locks for them.
     def self.execute_jobs(queue = '*', limit = 5)
       jobs = self.where(:status => ['pending', 'delayed'], :worker => nil).where(["run_at <= ?", Time.now.utc]).order("priority asc").limit(5)
@@ -51,7 +51,7 @@ module Steve
       jobs_executed = Array.new
       for job in pending_jobs.sort_by { rand() }
         Steve.log "[#{job.id}] Attempt to aquire lock"
-        if job.lock 
+        if job.lock
           Steve.log "[#{job.id}] Lock acquired"
           if @child = fork
             rand
@@ -63,7 +63,7 @@ module Steve
             $0 = "sj: executing job ##{job.id} since #{Time.now.utc.to_s(:db)}"
             Steve.after_job_fork.call if Steve.after_job_fork.is_a?(Proc)
             job.execute
-            exit
+            exit!
           end
           jobs_executed << job
         else
@@ -72,7 +72,7 @@ module Steve
       end
       jobs_executed
     end
-    
+
     ## Execute this job, catching any errors if they occur and ensuring the
     ## job is started & finished as appropriate.
     def execute
@@ -92,17 +92,37 @@ module Steve
           else
             self.error = e.message
             delay!
-            Steve.log "[#{self.id}] Delayed ('#{e.message}')"            
+            Steve.log "[#{self.id}] Delayed ('#{e.message}')"
           end
         rescue Timeout::Error
+          reconnect_database!
           fail!('Timed out')
           Steve.log "[#{self.id}] Timed out: #{e.to_s}"
         rescue => e
           if e.is_a?(Steve::Job::Error)
             fail!(e.message)
           else
+            fail!([e.to_s, e.backtrace].join("\n"))
             if defined?(Airbrake)
-              Airbrake.notify(e, :component => self.job.to_s, :action => self.id.to_s, :parameters => self.params)
+              begin
+                Timeout.timeout(5) do
+                  Airbrake.notify(e, :component => self.job.to_s, :action => self.id.to_s, :parameters => self.params)
+                end
+              rescue Timeout::Error
+                reconnect_database!
+                Steve.log "[#{self.id}] Timed out sending exception to Airbrake"
+              end
+            end
+            if defined?(Raven)
+              Raven.capture_exception(e, :tags => {:component => 'worker'}, :extra => {:steve => {
+                :id          => self.id,
+                :priority    => self.priority,
+                :attempts    => self.retries,
+                :run_at      => self.run_at,
+                :queue       => self.queue,
+                :created_at  => self.created_at,
+                :params      => self.params
+              }})
             end
             fail!([e.to_s, e.backtrace].join("\n"))
           end
@@ -114,12 +134,11 @@ module Steve
         return false
       end
     ensure
-      STDOUT.flush && STDERR.flush
-      if File.exist?(output_file)
-        self.output = File.read(output_file)
-        FileUtils.rm(output_file)
-      end
       self.save(:validate => false)
+      STDOUT.flush
+      STDERR.flush
+
+      FileUtils.rm(output_file) if File.exist?(output_file)
     end
 
     ## Get the output of a job, even if the job is in progress,
@@ -129,10 +148,10 @@ module Steve
       if read_attribute(:output)
         read_attribute(:output)
       elsif File.exist?(output_file)
-        File.read(output_file) 
+        File.read(output_file)
       end
     end
-    
+
     ## Get a lock on this job. Returns true if the lock was successful
     ## otherwise it returns false.
     def lock
@@ -144,25 +163,25 @@ module Steve
         return false
       end
     end
-    
+
     ## Mark this job as succeeded successfully.
     def success!
       self.status = 'completed'
       finish!
     end
-    
+
     ## Mark this job as failed.
     def fail!(message)
       self.error = message
       self.status = 'failed'
       finish!
     end
-    
+
     ## Mark this job as finished
     def finish!
       self.finished_at = Time.now.utc
     end
-    
+
     ## Mark this job as started
     def start!
       self.error = nil
@@ -172,7 +191,7 @@ module Steve
       self.job_pid = Process.pid
       self.save(:validate => false)
     end
-    
+
     ## Delay this job by the time specified
     def delay!(delay_time = 30.seconds)
       self.status = 'delayed'
@@ -182,13 +201,13 @@ module Steve
       self.retries += 1
       self.save(:validate => false)
     end
-    
+
     ## Associate this job with the pased active record object
     def associate_with(object)
       self.associated_object = object
       self.save(:validate => false)
     end
-    
+
     ## In a state appropriate to be archived?
     def archive_job?
       ['failed', 'completed'].include?(self.status)
@@ -202,6 +221,10 @@ module Steve
     def self.cleanup(age = 5.days.ago)
       self.delete_all(["status = 'completed' and run_at < ?", age])
     end
-    
+
+    def reconnect_database!
+      self.class.connection.reconnect!
+    end
+
   end
 end

data/lib/steve/worker.rb

@@ -1,20 +1,20 @@
 module Steve
   class Worker
-    
+
     def initialize(queue)
       @queue = queue
     end
-    
+
     def start
       Steve.log "*** Starting job worker #{Steve.worker_name} (queue: #{@queue})"
-      
+
       trap("TERM") { Steve.log("*** Exiting..."); $exit = true }
       trap("INT")  { Steve.log("*** Exiting..."); $exit = true }
-      
+
       loop do
         jobs = Steve::QueuedJob.execute_jobs(@queue)
         count = jobs.size
-        
+
         unless count == 0
           Steve.log "*** #{count} jobs processed"
         else
@@ -22,10 +22,10 @@ module Steve
           $0 = "sj: waiting for jobs on #{@queue}"
           sleep(Steve.worker_sleep_time || 5)
         end
-        
+
         break if $exit
       end
-      
+
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: steve
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - aTech Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+date: 2019-09-30 00:00:00.000000000 Z
+dependencies: []
 description: 
 email: support@atechmedia.com
 executables: []
@@ -62,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Steve Jobs background job runner