Skip to content
Snippets Groups Projects
Commit a02a4dfa authored by Jacob Vosmaer (GitLab)'s avatar Jacob Vosmaer (GitLab)
Browse files

Remove duplicate log path generation

parent 976185db
No related branches found
No related tags found
2 merge requests!6886DELETE THIS MERGE REQUEST,!4805user creation api extension: Added temp password feature from admin ui into users api call
Loading
Loading
@@ -14,15 +14,19 @@ namespace :sidekiq do
Rake::Task['sidekiq:stop'].invoke
puts 'Starting new sidekiq process.'
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
 
desc "GITLAB | Start sidekiq with launchd on Mac OS X"
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
 
def pidfile
Rails.root.join("tmp", "pids", "sidekiq.pid")
end
def log_file
Rails.root.join("log", "sidekiq.log")
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment