rescheduler 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0575537baa956f4e8628a7892d9bcc0c3c6a80
-  data.tar.gz: 1481a1e1b3f2f4e491787793466db8479235ff61
+  metadata.gz: 85c352b4ca6259305ae8fa32ba0fc16c0c00aef0
+  data.tar.gz: 7d54913d094dced68ae4210a791471e022495aad
 SHA512:
-  metadata.gz: 2107fe553f4b8a9570b8623d5d46b46552d8ead112201c7d80dd62df309ad280b3fb9d3c3876995ac02674a035e02f6d5f2653e959b03b346fdf589e2600c26a
-  data.tar.gz: f897e041abbab34c119c70aad94c9333c4f4c94b52d72940b72483844d2be4f38eea31de2d38bc91401c6e2f7c9e3083db0b2b1b014926f1d383a7f5c715a844
+  metadata.gz: 6625da10818cf1aefdc48e3561c17c93d059939225bfdb784b0267771fc6b23db4d0ca89bff2b19fa112fa3bf2a5ad309624323dcf14dd09adb13cd75cc4ff3a
+  data.tar.gz: a6838adb3e3e6f1618df27dbce9f6a9d361539ecebd173e1a458e0dcf2008e6a3ebc42728835e9d63e0b8791a09804de4f2929579bdb5af57bbd957232d755c2

data/bin/rescheduler_launch

@@ -1,50 +1,53 @@
-#!/usr/bin/env ruby
-=begin
-rescheduler_launch <options> [<worker_name> <jobs.rb>]
-Options:
-  --rails=<folder>    Use rails environment from the givne folder
-  --log=<file>        Specify logfile (in Rails mode default to <rails_foler>/log/<worker_name>.log)
-  --env=<env>         Set these ENV into the new process
-  --debug             Do not daemonize or redirect output, work with current STDOUT
-  --respawn_jobs=N    Respawn worker after N jobs
-  --respawn_time=N    Respawn every N seconds (NOTE: Only will respawn after finish a job)
-Internal purpose only:
-  --respawn           Set to indicate this is a respawn of the named worker and will take over the
-                      name without deleting stats
-=end
-
-# First parse options
-opts = {}
-while ARGV.size > 0 && ARGV[0][0..1] == '--'
-  opt,val = ARGV.shift[2..-1].split('=',2)
-  val ||= true
-  opts[opt] = val
-end
-
-opts['worker_name'] = ARGV.shift
-opts['worker_file'] = ARGV.shift
-
-abort "rescheduler_launch <options> <worker_name> <jobs.rb>" unless opts['worker_file'] && File.exists?(opts['worker_file'])
-
-# Daemonize first before we load rails
-begin
-  Process.daemon unless opts['debug'] # Do not daemonize if debugging
-rescue NotImplementedError
-  # This happens in windows, it is OK
-end
-
-# Load rails environment if --rails is specified
-require File.join(opts['rails'], 'config/environment.rb') if opts['rails']
-
-# Load rescheduler
-require File.expand_path('../../lib/rescheduler', __FILE__)
-
-Rescheduler::Worker.register(opts)
-Rescheduler::Worker.redirect_logging(opts) unless opts['debug']
-
-# Running the job file
-begin
-  Kernel.load opts['worker_file']
-ensure
-  Rescheduler::Worker.unregister unless Rescheduler::Worker.respawn_if_requested
-end
+#!/usr/bin/env ruby
+=begin
+rescheduler_launch <options> [<worker_name> <jobs.rb>]
+Options:
+  --rails=<folder>    Use rails environment from the givne folder
+  --log=<file>        Specify logfile (in Rails mode default to <rails_foler>/log/<worker_name>.log)
+  --env=<env>         Set these ENV into the new process
+  --debug             Do not daemonize or redirect output, work with current STDOUT
+  --respawn_jobs=N    Respawn worker after N jobs
+  --respawn_time=N    Respawn every N seconds (NOTE: Only will respawn after finish a job)
+Internal purpose only:
+  --respawn           Set to indicate this is a respawn of the named worker and will take over the
+                      name without deleting stats
+=end
+
+# First parse options
+opts = {}
+while ARGV.size > 0 && ARGV[0][0..1] == '--'
+  opt,val = ARGV.shift[2..-1].split('=',2)
+  val ||= true
+  opts[opt] = val
+end
+
+opts['worker_name'] = ARGV.shift
+opts['worker_file'] = ARGV.shift
+
+abort "rescheduler_launch <options> <worker_name> <jobs.rb>" unless opts['worker_file'] && File.exists?(opts['worker_file'])
+
+# Daemonize first before we load rails
+begin
+  Process.daemon unless opts['debug'] # Do not daemonize if debugging
+rescue NotImplementedError
+  # This happens in windows, it is OK
+end
+
+# Load rails environment if --rails is specified
+require File.join(opts['rails'], 'config/environment.rb') if opts['rails']
+
+# Load rescheduler
+require File.expand_path('../../lib/rescheduler', __FILE__)
+
+Rescheduler::Worker.register(opts)
+Rescheduler::Worker.redirect_logging(opts) unless opts['debug']
+
+Rescheduler.log_debug "[#{Rescheduler::Worker.worker_name}] Launching"
+
+
+# Running the job file
+begin
+  Kernel.load opts['worker_file']
+ensure
+  Rescheduler::Worker.unregister unless Rescheduler::Worker.respawn_if_requested
+end

data/lib/rescheduler.rb

@@ -345,6 +345,7 @@ module Rescheduler
   # Logging facility
   def log_debug(msg)
     return if config[:silent]
+    msg = msg.encode('UTF-8', invalid: :replace, undef: :replace)
     print("#{Time.now.iso8601} #{msg}\n")
     STDOUT.flush
   end

data/lib/rescheduler/worker.rb

@@ -147,16 +147,16 @@ module Rescheduler
 
     def register(opt)
       @launch_options = opt # Save for respawning
-      name_pattern = opt['worker_name']
-
-      last_wname = nil
-      widx = 0 # We do not preserve worker_index upon respawn
-      wname = nil
-      if opt['respawn']
-        wname = name_pattern
+      if @launch_options['respawn']
+        wname = @launch_options['worker_name']
         # Reset created for respawn purposes.
         redis.hset(rk_worker(wname), 'created', Time.now.to_i)
       else
+        name_pattern = @launch_options['worker_name']
+
+        widx = 0 # We do not preserve worker_index upon respawn
+        wname = nil
+        last_wname = nil
         loop do
           wname = name_pattern.gsub('%', widx.to_s)
           if wname == last_wname # For the name without %, we add one to the end if clashes
@@ -168,9 +168,9 @@ module Rescheduler
           widx += 1
           last_wname = wname
         end
+        @launch_options['worker_name'] = wname # Save this in launch options
+        @launch_options['worker_index'] = widx # Sequence of the same worker
       end
-      @launch_options['worker_name'] = wname # Save this in launch options
-      @launch_options['worker_index'] = widx # Sequence of the same worker
       @launch_options['pid'] = Process.pid
       @launch_options['machine'] = Socket.gethostname
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rescheduler
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Dongyi Liao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: Rescheduler is a library that uses Redis to maintain a task queue of
   immediate and delayed jobs without polling.
 email: liaody@gmail.com
@@ -52,7 +52,7 @@ files:
 - lib/rescheduler/worker.rb
 homepage: https://github.com/liaody/rescheduler
 licenses:
-- BSD
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []