em-resque 1.0.0.beta4 → 1.0.0.beta5

data/README.markdown

@@ -198,8 +198,8 @@ resque_config = YAML.load_file("#{RAILS_ROOT}/config/resque.yml")
 proxy_config = YAML.load_file("#{RAILS_ROOT}/config/proxy.yml")
 PROXY = proxy_config ? proxy_config[RAILS_ENV] : nil
 
-EM::Resque.redis = resque_config[RAILS_ENV]
-EM::Resque::WorkerMachine.new(TaskHelper.parse_opts_from_env).start
+opts = TaskHelper.parse_opts_from_env.merge(:redis => resque_config[RAILS_ENV])
+EM::Resque::WorkerMachine.new(opts).start
 ```
 
 You can start the script with the same environment variables as with the Rake
@@ -216,16 +216,16 @@ Configuration
 You may want to change the Redis host and port Resque connects to, or
 set various other options at startup.
 
-EM::Resque has a `redis` setter which can be given a string or a Redis
-object. This means if you're already using Redis in your app, EM::Resque
-can re-use the existing connection. EM::Resque is using the non-blocking
-em-redis by default.
+WorkerMachine has a `redis` parameter in the initializer, which can be 
+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.
 
-String: `Resque.redis = 'localhost:6379'`
+String: `EM::Resque::WorkerMachine.new(opts.merge(:redis => 'localhost:6379'))`
 
-Redis: `Resque.redis = $redis`
-
-TODO: Better configuration instructions.
+Redis: `EM::Resque::WorkerMachine.new(opts.merge(:redis => $redis))`
 
 Namespaces
 ----------

data/lib/em-resque/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Resque
-    Version = VERSION = '1.0.0.beta4'
+    Version = VERSION = '1.0.0.beta5'
   end
 end

data/lib/em-resque/worker_machine.rb

@@ -39,8 +39,6 @@ module EventMachine
 
         build_workers
         build_fibers
-        trap_signals
-        prune_dead_workers
         create_pidfile
       end
 
@@ -48,6 +46,8 @@ module EventMachine
       def start
         EM.synchrony do
           EM::Resque.redis = redis_instance(@redis)
+          prune_dead_workers
+          trap_signals
           @fibers.each(&:resume)
           system_monitor.resume
         end
@@ -114,7 +114,7 @@ module EventMachine
       end
 
       def create_pidfile
-        File.open(@pidfile, 'w') { |f| f << @workers.first.pid } if @pidfile
+        File.open(@pidfile, 'w') { |f| f << Process.pid } if @pidfile
       end
 
       def redis_instance(server)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-resque
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &19367640 !ruby/object:Gem::Requirement
+  requirement: &18876140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *19367640
+  version_requirements: *18876140
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &19366960 !ruby/object:Gem::Requirement
+  requirement: &18875480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19366960
+  version_requirements: *18875480
 - !ruby/object:Gem::Dependency
   name: em-redis
-  requirement: &19366480 !ruby/object:Gem::Requirement
+  requirement: &18874980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19366480
+  version_requirements: *18874980
 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