resqued 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 217c9c390f76d08b6a1aa2e16f926681a0e6bb75
-  data.tar.gz: 947f5a477ae6533808679d9bc43596415fe84131
+  metadata.gz: 661e830ef15b07d0ed331ab8b628cb59671689ed
+  data.tar.gz: 7f88d962a1b042b3729732eae6a1dfa77ac768af
 SHA512:
-  metadata.gz: a327fea71345130cb1db0c66ddb3f385061323e6c1261fd25a3f785bee413f998523ce4aa4e1addf8339f58de4b7255b9b35b676225ee5290bbe9d31d4a0968f
-  data.tar.gz: 5fda5a050c55ac5e7dbc911aceae8ba78a288f63fae042b57b88e13b9dcafe2ccec00ff4f87f2541f4bcba46ea2875a348630c85c55775c418b15f68915a2700
+  metadata.gz: b1d3e137b01bc0d71bc5c43f694286dd2ee1a4ea1ac0c9682779dc72eabd470c9042332b5736184491db41d75e63c0045d3d5afc861ac1f18a9ed52ea1c7fbcc
+  data.tar.gz: 4c96242b6bcfcb59d360aef1b0be97b75cfbe4d0cf9c67a286fb4fcd514786188432ac0c5845abbb62a39dd954a47cc6b22ae898d464e4853717c79394edaf68

data/CHANGES.md

@@ -1,5 +1,10 @@
 Starting with version 0.6.1, resqued uses semantic versioning to indicate incompatibilities between the master process, listener process, and configuration.
 
+v0.7.13
+-------
+
+* Support for symlinks in production environments. (#36)
+
 v0.7.12
 -------
 

data/README.md

@@ -55,6 +55,36 @@ This time, you'd end up with something similar to this:
 
 * `:interval` - The interval to pass to `Resque::Worker#run`.
 
+## Launching in production.
+
+Resqued restarts when its master process receives `SIGHUP`. It restarts by re-execing the command that you initially ran. There are two main recommendations for running in production.
+
+* If you use bundler to install resqued, tell it to generate a binstub for resqued. Invoke this binstub (e.g. `bin/resqued`) when you start resqued.
+
+* Specify a pid file using the `-p` option. This pidfile will have the PID of the master process. See [docs/signals.md](docs/signals.md) for more information about which signals are supported.
+
+If your application is running from a symlinked dir (for example, [capistrano's "current" symlink](http://capistranorb.com/documentation/getting-started/structure/)), you'll need to do two more things:
+
+* Ensure that your resqued master process is at least 0.7.13 (`ps o args= $RESQUED_MASTER_PID` should start with "resqued-0.7.13" or higher).
+
+* Explicitly set the `BUNDLE_GEMFILE` environment variable to the symlink dir of your app.
+
+* If you're invoking resqued from something that resolves symlinks in `pwd`, you'll also want to explicitly set the `PWD` environment variable.
+
+Rolling all of the above advice together, here's a sample that you could use in an upstart script for resqued:
+
+```
+# fragment of /etc/init/resqued.conf
+
+kill signal QUIT
+
+env BUNDLE_GEMFILE=/opt/app/current/Gemfile
+env PWD=/opt/app/current
+chdir /opt/app/current
+
+exec bin/resqued -c config/resqued.rb -p /opt/app/shared/tmp/pids/resqued.pid
+```
+
 ## Compatibility with Resque
 
 Resqued does not automatically split comma-separated lists of queues in

data/exe/resqued

@@ -61,7 +61,7 @@ if test
   end
 else
   require 'resqued'
-  Resqued::START_CTX['$0'] = $0.dup
+  Resqued.capture_start_ctx!
   resqued = Resqued::Master.new(options)
   if daemonize
     require 'resqued/daemon'

data/lib/resqued.rb

@@ -3,4 +3,21 @@ require 'resqued/version'
 
 module Resqued
   START_CTX = {}
+
+  def self.capture_start_ctx!
+    START_CTX['$0'] = $0.dup
+    START_CTX['pwd'] =
+      begin
+        env_pwd = ENV["PWD"]
+        env_pwd_stat = File.stat env_pwd
+        dir_pwd_stat = File.stat Dir.pwd
+        if env_pwd_stat.ino == dir_pwd_stat.ino && env_pwd_stat.dev == dir_pwd_stat.dev
+          env_pwd
+        else
+          Dir.pwd
+        end
+      rescue
+        Dir.pwd
+      end
+  end
 end

data/lib/resqued/listener.rb

@@ -36,7 +36,11 @@ module Resqued
       ENV['RESQUED_LISTENER_ID'] = @listener_id.to_s
       ENV['RESQUED_MASTER_VERSION'] = Resqued::VERSION
       log "exec: #{Resqued::START_CTX['$0']} listener"
-      Kernel.exec(Resqued::START_CTX['$0'], 'listener', socket_fd => socket_fd) # The hash at the end only works in new-ish (1.9+ or so) rubies. It's required for ruby 2.0.
+      exec_opts = {socket_fd => socket_fd} # Ruby 2.0 needs to be told to keep the file descriptor open during exec.
+      if start_pwd = Resqued::START_CTX['pwd']
+        exec_opts[:chdir] = start_pwd
+      end
+      Kernel.exec(Resqued::START_CTX['$0'], 'listener', exec_opts)
     end
 
     # Public: Given args from #exec, start this listener.

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.7.12'
+  VERSION = '0.7.13'
 end

data/spec/resqued/start_ctx_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+require "tmpdir"
+require "resqued"
+
+describe "Resqued::START_CTX" do
+  before do
+    Resqued::START_CTX.clear
+  end
+
+  it "captures '$0'" do
+    Resqued.capture_start_ctx!
+    expect(Resqued::START_CTX["$0"]).to be_a(String)
+  end
+
+  it "captures pwd" do
+    Resqued.capture_start_ctx!
+    expect(Resqued::START_CTX["pwd"]).to eq(Dir.pwd)
+  end
+
+  it "captures pwd without resolving symlinks" do
+    tmpdir = Dir.mktmpdir
+    begin
+      realdir = File.expand_path("#{tmpdir}/realdir")
+      linkdir = File.expand_path("#{tmpdir}/linked")
+
+      Dir.mkdir realdir
+      File.symlink "realdir", linkdir
+
+      original_pwd, ENV["PWD"] = ENV["PWD"], linkdir
+      Dir.chdir linkdir do
+        Resqued.capture_start_ctx!
+        expect(Resqued::START_CTX["pwd"]).to eq(linkdir)
+      end
+    ensure
+      ENV["PWD"] = original_pwd
+      FileUtils.remove_entry_secure(tmpdir)
+    end
+  end
+
+  it "captures pwd when ENV['PWD'] is wrong" do
+    tmpdir = Dir.mktmpdir
+    begin
+      realdir = File.expand_path("#{tmpdir}/realdir")
+      linkdir = File.expand_path("#{tmpdir}/linked")
+
+      Dir.mkdir realdir
+      File.symlink "realdir", linkdir
+
+      Dir.chdir linkdir do
+        Resqued.capture_start_ctx!
+        expect(Resqued::START_CTX["pwd"]).to eq(Dir.pwd)
+      end
+    ensure
+      FileUtils.remove_entry_secure(tmpdir)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -123,6 +123,7 @@ files:
 - spec/resqued/config/worker_spec.rb
 - spec/resqued/config_spec.rb
 - spec/resqued/sleepy_spec.rb
+- spec/resqued/start_ctx_spec.rb
 - spec/resqued/test_case_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
@@ -163,6 +164,7 @@ test_files:
 - spec/resqued/config/worker_spec.rb
 - spec/resqued/config_spec.rb
 - spec/resqued/sleepy_spec.rb
+- spec/resqued/start_ctx_spec.rb
 - spec/resqued/test_case_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb