Commit 7991b044 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Remove duplicate log path generation

parent 2128419c
...@@ -14,15 +14,19 @@ namespace :sidekiq do ...@@ -14,15 +14,19 @@ namespace :sidekiq do
Rake::Task['sidekiq:stop'].invoke Rake::Task['sidekiq:stop'].invoke
puts 'Starting new sidekiq process.' puts 'Starting new sidekiq process.'
end end
system "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &" system "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{log_file} 2>&1 &"
end end
desc "GITLAB | Start sidekiq with launchd on Mac OS X" desc "GITLAB | Start sidekiq with launchd on Mac OS X"
task :launchd do task :launchd do
system "bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1" system "bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{log_file} 2>&1"
end end
def pidfile def pidfile
Rails.root.join("tmp", "pids", "sidekiq.pid") Rails.root.join("tmp", "pids", "sidekiq.pid")
end end
def log_file
Rails.root.join("log", "sidekiq.log")
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment