rocketjob 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 766a8b76f06f83475128aa268aa2d54fc4ca7b10
-  data.tar.gz: 20b232869d4a43acd28fecf4417030e99c88d2dc
+  metadata.gz: 6eb90dc1e3aea713b4d981636208f44a0da52e6c
+  data.tar.gz: 1f9f590f2789f050d736af772843b78bd98d1795
 SHA512:
-  metadata.gz: 56a8ce86eb62461128bace7cf0a8756deab0f88591f1a94f2ea951574cd47cc64e0dae0a2afdef8c6f74d2c4eb658cb00f7e0169612cbcac6d21aa68fff9b306
-  data.tar.gz: 74facaf88ce3dd6bc744d9074d10a50e98c1366fe8da2a070b6fe4f92daf13a3fa37696466a811f344d1c4672fd75243e64375bdd06e23a0e1685216bd858810
+  metadata.gz: 3ab4508ac667d557a4eee4533d4bdbb15c8bb6b10c35a8f9f1f71e53e33f0a1276c7b55b6ba80743169efd19bc6f240311e678a527cdd469a5bed52d45406e66
+  data.tar.gz: 201ed97e4992979ada9af839f6951c5c3f8ae373ce6a93d07d6356571f07fc91b5319b8eb2915e2c1dc6be50ef56d845136479db17f7907528ffdf9822bda01a

data/lib/rocket_job/cli.rb

@@ -131,7 +131,7 @@ module RocketJob
     # Parse command line options placing results in the corresponding instance variables
     def parse(argv)
       parser        = OptionParser.new do |o|
-        o.on('-n', '--name NAME', 'Unique Name of this worker instance (Default: hostname:PID)') do |arg|
+        o.on('-n', '--name NAME', 'Unique Name of this worker instance (Default: host_name:PID)') do |arg|
           @name = arg
         end
         o.on('-t', '--threads COUNT', 'Number of worker threads to start') do |arg|

data/lib/rocket_job/extensions/mongo.rb

@@ -13,7 +13,7 @@ module Mongo
       MongoClient.logger.send(level, msg)
     end
 
-    protected
+    private
 
     def log_operation(name, payload, duration)
       MongoClient.logger.benchmark_trace(name, duration: (duration * 1000), payload: payload)

data/lib/rocket_job/jobs/simple_job.rb

@@ -4,7 +4,6 @@ module RocketJob
     class SimpleJob < RocketJob::Job
       # No operation, used for performance testing
       def perform
-        sleep 1
       end
     end
 

data/lib/rocket_job/plugins/job/persistence.rb

@@ -35,38 +35,37 @@ module RocketJob
           #   skip_job_ids [Array<BSON::ObjectId>]
           #     Job ids to exclude when looking for the next job
           def self.rocket_job_retrieve(worker_name, skip_job_ids = nil)
-            run_at       = [
+            run_at = [
               {run_at: {'$exists' => false}},
               {run_at: {'$lte' => Time.now}}
             ]
-            query        =
-              if defined?(RocketJobPro)
-                {
-                  '$and' => [
-                    {
-                      '$or' => [
-                        {'state' => 'queued'}, # Jobs
-                        {'state' => 'running', 'sub_state' => :processing} # Slices
-                      ]
-                    },
-                    {
-                      '$or' => run_at
-                    }
-                  ]
-                }
-              else
-                {
-                  'state' => 'queued',
-                  '$or'   => run_at
-                }
-              end
+            update = query = nil
+            if defined?(RocketJobPro)
+              query  = {
+                '$and' => [
+                  {
+                    '$or' => [
+                      {'state' => 'queued'}, # Jobs
+                      {'state' => 'running', 'sub_state' => :processing} # Slices
+                    ]
+                  },
+                  {
+                    '$or' => run_at
+                  }
+                ]
+              }
+              update = {'$set' => {'worker_name' => worker_name, 'state' => 'running'}}
+            else
+              query  = {'state' => 'queued', '$or' => run_at}
+              update = {'$set' => {'worker_name' => worker_name, 'state' => 'running', 'started_at' => Time.now}}
+            end
 
             query['_id'] = {'$nin' => skip_job_ids} if skip_job_ids && skip_job_ids.size > 0
 
             if doc = find_and_modify(
               query:  query,
               sort:   {priority: 1, _id: 1},
-              update: {'$set' => {'worker_name' => worker_name, 'state' => 'running'}}
+              update: update
             )
               load(doc)
             end

data/lib/rocket_job/plugins/job/worker.rb

@@ -59,7 +59,9 @@ module RocketJob
                 logger.info "Destroyed expired job #{job.class.name}, id:#{job.id}"
               else
                 job.worker_name = worker_name
-                job.rocket_job_fail_on_exception!(worker_name) { job.start }
+                job.rocket_job_fail_on_exception!(worker_name) do
+                  defined?(RocketJobPro) ? job.start! : job.start
+                end
                 return job if job.running?
               end
             end

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0.rc2'
 end

data/lib/rocket_job/worker.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-require 'socket'
 require 'concurrent'
 module RocketJob
   # Worker
@@ -33,11 +32,10 @@ module RocketJob
 
     # @formatter:off
     # Unique Name of this worker instance
-    #   Defaults to the `hostname` but _must_ be overriden if mutiple Worker instances
-    #   are started on the same host
+    #   Default: `host name:PID`
     # The unique name is used on re-start to re-queue any jobs that were being processed
     # at the time the worker or host unexpectedly terminated, if any
-    key :name,               String, default: -> { "#{Socket.gethostname}:#{$$}" }
+    key :name,               String, default: -> { "#{SemanticLogger.host}:#{$$}" }
 
     # The maximum number of threads that this worker should use
     #   If set, it will override the default value in RocketJob::Config

data/test/test_helper.rb

@@ -1,5 +1,10 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
+begin
+  require 'active_model/serializers'
+rescue LoadError
+  # Only used when running Rails 5
+end
 require 'yaml'
 require 'minitest/autorun'
 require 'minitest/reporters'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mongo_ha
   requirement: !ruby/object:Gem::Requirement