Skip to content

Commit

Permalink
whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
bkeepers committed Nov 25, 2010
1 parent 602e5c8 commit 6ef0fc6
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions lib/delayed/command.rb
Expand Up @@ -5,17 +5,17 @@
module Delayed module Delayed
class Command class Command
attr_accessor :worker_count attr_accessor :worker_count

def initialize(args) def initialize(args)
@files_to_reopen = [] @files_to_reopen = []
@options = { @options = {
:quiet => true, :quiet => true,
:pid_dir => "#{Rails.root}/tmp/pids" :pid_dir => "#{Rails.root}/tmp/pids"
} }

@worker_count = 1 @worker_count = 1
@monitor = false @monitor = false

opts = OptionParser.new do |opts| opts = OptionParser.new do |opts|
opts.banner = "Usage: #{File.basename($0)} [options] start|stop|restart|run" opts.banner = "Usage: #{File.basename($0)} [options] start|stop|restart|run"


Expand Down Expand Up @@ -47,17 +47,17 @@ def initialize(args)
end end
@args = opts.parse!(args) @args = opts.parse!(args)
end end

def daemonize def daemonize
Delayed::Worker.backend.before_fork Delayed::Worker.backend.before_fork


ObjectSpace.each_object(File) do |file| ObjectSpace.each_object(File) do |file|
@files_to_reopen << file unless file.closed? @files_to_reopen << file unless file.closed?
end end

dir = @options[:pid_dir] dir = @options[:pid_dir]
Dir.mkdir(dir) unless File.exists?(dir) Dir.mkdir(dir) unless File.exists?(dir)

if @worker_count > 1 && @options[:identifier] if @worker_count > 1 && @options[:identifier]
raise ArgumentError, 'Cannot specify both --number-of-workers and --identifier' raise ArgumentError, 'Cannot specify both --number-of-workers and --identifier'
elsif @worker_count == 1 && @options[:identifier] elsif @worker_count == 1 && @options[:identifier]
Expand All @@ -70,16 +70,16 @@ def daemonize
end end
end end
end end

def run_process(process_name, dir) def run_process(process_name, dir)
Daemons.run_proc(process_name, :dir => dir, :dir_mode => :normal, :monitor => @monitor, :ARGV => @args) do |*args| Daemons.run_proc(process_name, :dir => dir, :dir_mode => :normal, :monitor => @monitor, :ARGV => @args) do |*args|
run process_name run process_name
end end
end end

def run(worker_name = nil) def run(worker_name = nil)
Dir.chdir(Rails.root) Dir.chdir(Rails.root)

# Re-open file handles # Re-open file handles
@files_to_reopen.each do |file| @files_to_reopen.each do |file|
begin begin
Expand All @@ -88,10 +88,10 @@ def run(worker_name = nil)
rescue ::Exception rescue ::Exception
end end
end end

Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log')) Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
Delayed::Worker.backend.after_fork Delayed::Worker.backend.after_fork

worker = Delayed::Worker.new(@options) worker = Delayed::Worker.new(@options)
worker.name_prefix = "#{worker_name} " worker.name_prefix = "#{worker_name} "
worker.start worker.start
Expand All @@ -100,6 +100,6 @@ def run(worker_name = nil)
STDERR.puts e.message STDERR.puts e.message
exit 1 exit 1
end end

end end
end end

0 comments on commit 6ef0fc6

Please sign in to comment.