em-resque 1.1.0 → 1.1.1

data/README.markdown

@@ -1,3 +1,9 @@
+THIS FORK
+=========
+
+This fork is intended to only run one fiber and does not use Fiber yielding to pick up jobs. This fork was created
+because the EM::Synchrony.sleep solution does not work well for sending Apple Push Notifications.
+
 EM::Resque
 ==========
 
@@ -216,7 +222,7 @@ given a string or a Redis object. This means if you're already using
 Redis in your app, EM::Resquec an re-use the existing connection. 
 EM::Resque is using the non-blocking em-redis when given the host as a
 string. If using a Redis object, please use the non-blocking
-EM::Protocols::Redis.
+EM::Hiredis.
 
 String: `EM::Resque::WorkerMachine.new(opts.merge(:redis => 'localhost:6379'))`
 

data/lib/em-resque.rb

@@ -1,28 +1,17 @@
 require 'resque'
 require 'em-synchrony'
-require 'em-synchrony/em-redis'
+require 'em-hiredis'
 require 'em-synchrony/connection_pool'
 require 'uri'
 
 module EM::Resque
   extend Resque
 
-  def self.initialize_redis(server, pool_size = 1)
+  def self.initialize_redis(server, namespace = :resque, pool_size = 1)
     case server
     when String
-      opts = if server =~ /redis\:\/\//
-               uri = URI.parse(server)
-               {:host => uri.host, :port => uri.port}
-             else
-               server, namespace = server.split('/', 2)
-               host, port, db = server.split(':')
-               {:host => host, :port => port, :thread_safe => true, :db => db}
-             end
-
-      namespace ||= :resque
-
       redis = EventMachine::Synchrony::ConnectionPool.new(:size => pool_size) do
-        EM::Protocols::Redis.connect(opts)
+        EM::Hiredis.connect(server)
       end
 
       Resque.redis = Redis::Namespace.new(namespace, :redis => redis)

data/lib/em-resque/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Resque
-    Version = VERSION = '1.1.0'
+    Version = VERSION = '1.1.1'
   end
 end

data/lib/em-resque/worker.rb

@@ -3,10 +3,83 @@ require 'resque'
 # A non-forking version of Resque worker, which handles waiting with
 # a non-blocking version of sleep. 
 class EventMachine::Resque::Worker < Resque::Worker
+  attr_accessor :tick_instead_of_sleep
+
+  def initialize(*args)
+    super(*args)
+    self.tick_instead_of_sleep = false
+  end
+
   # Overwrite system sleep with the non-blocking version
   def sleep(interval)
     EM::Synchrony.sleep interval
   end
+
+  # Overwrite Resque's #work method to allow us to determine whether or not we want to ticks through a reactor
+  # instead of using EM::Synchrony sleep.
+  #
+  # The reason for this option is because when sending push notifications and using 1 fiber, the response from Apple
+  # will come after another job has been finished and is generally unreliable. Note that this means that you can't use
+  # this worker with more than one fiber for push workers.
+  def work(interval = 5.0, &block)
+    if self.tick_instead_of_sleep
+      work_tick(interval, &block)
+    else
+      super(interval, &block)
+    end
+  end
+
+  # Resque::Worker's #work method modified to use EM.next_tick instead of sleep
+  def work_tick(interval, &block)
+    interval = Float(interval)
+    $0 = "resque: Starting"
+    startup
+
+    work_loop = lambda do
+      if shutdown?
+        unregister_worker
+        EM.stop
+        next
+      end
+
+      if not paused? and job = reserve
+        log "got: #{job.inspect}"
+        job.worker = self
+        run_hook :before_fork, job
+        working_on job
+
+        if @child = fork
+          srand # Reseeding
+          procline "Forked #{@child} at #{Time.now.to_i}"
+          begin
+            Process.waitpid(@child)
+          rescue SystemCallError
+            nil
+          end
+        else
+          unregister_signal_handlers if !@cant_fork && term_child
+          procline "Processing #{job.queue} since #{Time.now.to_i}"
+          redis.client.reconnect # Don't share connection with parent
+          perform(job, &block)
+          exit! unless @cant_fork
+          EM::Timer.new(interval) do
+            EM.next_tick(&work_loop)
+          end
+        end
+
+        done_working
+        @child = nil
+      else
+        break if interval.zero?
+        log! "Sleeping for #{interval} seconds"
+        procline paused? ? "Paused" : "Waiting for #{@queues.join(',')}"
+        EM::Timer.new(interval) do
+          EM.next_tick(&work_loop)
+        end
+      end
+    end
+    EM.next_tick(&work_loop)
+  end
   
   # Be sure we're never forking
   def fork

data/lib/em-resque/worker_machine.rb

@@ -16,24 +16,30 @@ module EventMachine
       # signals and prunes dead workers
       #
       # == Options
-      # concurrency::  The number of green threads inside the machine (default 20)
+      # fibers::       The number of fibers to use in the worker (default 1)
       # interval::     Time in seconds how often the workers check for new work
       #                (default 5)
-      # fibers_count:: How many fibers (and workers) to be run inside the
-      #                machine (default 1)
       # queues::       Which queues to poll (default all)
       # verbose::      Verbose log output (default false)
       # vverbose::     Even more verbose log output (default false)
       # pidfile::      The file to save the process id number
+      # tick_instead_of_sleep::      Whether to tick through the reactor polling for jobs or use EM::Synchrony.sleep.
+      #                              Note that if you use this option, you'll be limited to 1 fiber.
       def initialize(opts = {})
-        @concurrency = opts[:concurrency] || 20
         @interval = opts[:interval] || 5
         @fibers_count = opts[:fibers] || 1
         @queues = opts[:queue] || opts[:queues] || '*'
         @verbose = opts[:logging] || opts[:verbose] || false
         @very_verbose = opts[:vverbose] || false
         @pidfile = opts[:pidfile]
+        @redis_namespace = opts[:namespace] || :resque
         @redis_uri = opts[:redis] || "redis://127.0.0.1:6379"
+        @tick_instead_of_sleep = !opts[:tick_instead_of_sleep].nil? ? opts[:tick_instead_of_sleep] : false
+
+        # If we're ticking instead of sleeping, we can only have one fiber
+        if @tick_instead_of_sleep
+          @fibers_count = 1
+        end
 
         raise(ArgumentError, "Should have at least one fiber") if @fibers_count.to_i < 1
 
@@ -45,11 +51,15 @@ module EventMachine
       # Start the machine and start polling queues.
       def start
         EM.synchrony do
-          EM::Resque.initialize_redis(@redis_uri, @fibers_count)
+          EM::Resque.initialize_redis(@redis_uri, @redis_namespace, @fibers_count)
           trap_signals
           prune_dead_workers
           @fibers.each(&:resume)
-          system_monitor.resume
+
+          # If we're ticking and not sleeping, we don't need to monitor for yielding
+          unless @tick_instead_of_sleep
+            system_monitor.resume
+          end
         end
       end
 
@@ -76,6 +86,7 @@ module EventMachine
           worker = EM::Resque::Worker.new(*queues)
           worker.verbose = @verbose
           worker.very_verbose = @very_verbose
+          worker.tick_instead_of_sleep = @tick_instead_of_sleep
 
           worker
         end

data/test/worker_test.rb

@@ -12,10 +12,12 @@ context "Worker" do
       worker = EM::Resque::Worker.new('*')
       worker.work(0)
 
-      assert_equal 1, EM::Resque.info[:processed]
+      EM::Timer.new(0.5) do
+        assert_equal 1, EM::Resque.info[:processed]
 
-      worker.shutdown!
-      EM.stop
+        worker.shutdown!
+        EM.stop
+      end
     end
   end
 
@@ -25,10 +27,12 @@ context "Worker" do
       worker = EM::Resque::Worker.new('*')
       worker.work(0)
 
-      assert_equal 1, EM::Resque.redis.get("stat:processed_jobs").to_i
+      EM::Timer.new(0.5) do
+        assert_equal 1, EM::Resque.redis.get("stat:processed_jobs").to_i
 
-      worker.shutdown!
-      EM.stop
+        worker.shutdown!
+        EM.stop
+      end
     end
   end
 
@@ -38,9 +42,11 @@ context "Worker" do
       worker = EM::Resque::Worker.new('*')
       worker.work(0)
 
-      assert_equal 1, Resque::Failure.count
-      worker.shutdown!
-      EM.stop
+      EM::Timer.new(0.5) do
+        assert_equal 1, Resque::Failure.count
+        worker.shutdown!
+        EM.stop
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-resque
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: em-redis
+  name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.1.0
 description: ! "    Em-resque is a version of Resque, which offers non-blocking and
   non-forking\n    workers. The idea is to have fast as possible workers for tasks
   with lots of\n    IO like pinging third party servers or hitting the database.\n\n
@@ -82,20 +82,20 @@ files:
 - Rakefile
 - LICENSE
 - HISTORY.md
-- lib/em-resque/version.rb
+- lib/em-resque.rb
+- lib/em-resque/task_helper.rb
 - lib/em-resque/worker.rb
-- lib/em-resque/tasks.rb
+- lib/em-resque/version.rb
 - lib/em-resque/worker_machine.rb
-- lib/em-resque/task_helper.rb
+- lib/em-resque/tasks.rb
 - lib/tasks/em-resque.rake
-- lib/em-resque.rb
 - test/worker_machine_test.rb
+- test/redis-test-cluster.conf
 - test/em-resque_test.rb
-- test/redis-test.conf
 - test/task_helpers_test.rb
-- test/redis-test-cluster.conf
 - test/worker_test.rb
 - test/test_helper.rb
+- test/redis-test.conf
 homepage: http://github.com/SponsorPay/em-resque
 licenses: []
 post_install_message: