diff --git a/lib/delayed/launcher/forking.rb b/lib/delayed/launcher/forking.rb index 00dfbb933..cf0779b8b 100644 --- a/lib/delayed/launcher/forking.rb +++ b/lib/delayed/launcher/forking.rb @@ -67,7 +67,7 @@ def run_loop end def on_exit - logger.info "#{get_name(process_identifier)} #{' (parent)' if worker_count > 1}exited gracefully - pid #{$$}" + logger.info "#{get_name(process_identifier)}#{' (parent)' if worker_count > 1} exited gracefully - pid #{$$}" end end end diff --git a/spec/delayed/launcher/shared_examples.rb b/spec/delayed/launcher/shared_examples.rb index 9fc8561e2..ab2db7c20 100644 --- a/spec/delayed/launcher/shared_examples.rb +++ b/spec/delayed/launcher/shared_examples.rb @@ -138,7 +138,7 @@ it { verify_worker_processes } end - context 'correctly handle :pools arg' do + context ':pools arg' do let(:options) { {:pools => [[[], 1], [['test_queue'], 4], [%w[mailers misc], 2]]} } let(:exp) do [ @@ -154,7 +154,7 @@ it { verify_worker_processes } end - context 'correctly handle :queues and :worker_count args' do + context ':queues and :worker_count args' do let(:options) { {:queues => %w[mailers misc], :worker_count => 4} } let(:exp) do [ @@ -167,7 +167,7 @@ it { verify_worker_processes } end - context 'correctly handle :pid_dir and :log_dir args' do + context ':pid_dir and :log_dir args' do let(:options) { {:pid_dir => './foo/bar', :log_dir => './baz/qux', :worker_count => 2} } let(:exp) do [ @@ -178,7 +178,7 @@ it { verify_worker_processes } end - context 'correctly handle :identifier and other args' do + context ':identifier and other args' do let(:options) { {:monitor => true, :prefix => 'my_prefix', :identifier => 'my_identifier', :worker_count => 2, :args => {:foo => 'bar', :baz => 'qux'}} } let(:exp) do [['delayed_job.my_identifier', {:pid_dir => './tmp/pids', :log_dir => './log'}]]