Commit 7991b0449920b0c90bd7c529bbb2e5b1699a87ef
1 parent
2128419c
Exists in
master
and in
4 other branches
Remove duplicate log path generation
Showing
1 changed file
with
6 additions
and
2 deletions
Show diff stats
lib/tasks/sidekiq.rake
| @@ -14,15 +14,19 @@ namespace :sidekiq do | @@ -14,15 +14,19 @@ namespace :sidekiq do | ||
| 14 | Rake::Task['sidekiq:stop'].invoke | 14 | Rake::Task['sidekiq:stop'].invoke |
| 15 | puts 'Starting new sidekiq process.' | 15 | puts 'Starting new sidekiq process.' |
| 16 | end | 16 | end |
| 17 | - 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 &" | 17 | + 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 &" |
| 18 | end | 18 | end |
| 19 | 19 | ||
| 20 | desc "GITLAB | Start sidekiq with launchd on Mac OS X" | 20 | desc "GITLAB | Start sidekiq with launchd on Mac OS X" |
| 21 | task :launchd do | 21 | task :launchd do |
| 22 | - 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" | 22 | + 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" |
| 23 | end | 23 | end |
| 24 | 24 | ||
| 25 | def pidfile | 25 | def pidfile |
| 26 | Rails.root.join("tmp", "pids", "sidekiq.pid") | 26 | Rails.root.join("tmp", "pids", "sidekiq.pid") |
| 27 | end | 27 | end |
| 28 | + | ||
| 29 | + def log_file | ||
| 30 | + Rails.root.join("log", "sidekiq.log") | ||
| 31 | + end | ||
| 28 | end | 32 | end |