From 551789f8619b567333bbf41020323f4e1624841c Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 4 Mar 2009 11:11:44 -0800 Subject: Remove "directory" config option Unicorn will always continue to run in the directory it started in, it does not chdir to "/". Since the default start_ctx[:cwd] is symlink-aware, this should not be a problem for Capistrano-deployed applications. --- lib/unicorn.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lib/unicorn.rb') diff --git a/lib/unicorn.rb b/lib/unicorn.rb index 8754610..0727456 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -131,13 +131,6 @@ module Unicorn @pid = path end - # sets the path for running the master and worker process, useful for - # running and reexecuting from a symlinked path like Capistrano allows - def directory=(path) - Dir.chdir(path) if path - @directory = path - end - # add a given address to the +listeners+ set, idempotently # Allows workers to add a private, per-process listener via the # @after_fork hook. Very useful for debugging and testing. @@ -331,7 +324,7 @@ module Unicorn ENV.replace(@start_ctx[:environ]) ENV['UNICORN_FD'] = @listeners.map { |sock| sock.fileno }.join(',') File.umask(@start_ctx[:umask]) - Dir.chdir(@directory || @start_ctx[:cwd]) + Dir.chdir(@start_ctx[:cwd]) cmd = [ @start_ctx[:zero] ] + @start_ctx[:argv] logger.info "executing #{cmd.inspect} (in #{Dir.pwd})" exec(*cmd) -- cgit v1.2.3-24-ge0c7