Download as
Browse Code »

Commit 11a49ac49ab1f7c39ce865d5ee1472d32a535382

Authored by Jacob Vosmaer
2 parents 8da230e7 e2f72863
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Merge branch 'sidekiq_log' into 'master' 

Fix missing sidekiq.log in the admin interface

See merge request !182
Showing 2 changed files with 7 additions and 0 deletions   Show diff stats
@@ -9,6 +9,7 @@ omnibus-gitlab repository. @@ -9,6 +9,7 @@ omnibus-gitlab repository.
9 - Enable the 'ssh_host' field in gitlab.yml (Florent Baldino) 9 - Enable the 'ssh_host' field in gitlab.yml (Florent Baldino)
10 - Create git's home directory if necessary 10 - Create git's home directory if necessary
11 - Update openssl to 1.0.1i 11 - Update openssl to 1.0.1i
  12 +- Fix missing sidekiq.log in the GitLab admin interface
12 13
13 7.1.0 14 7.1.0
14 - Build: explicitly use .forward for sending notifications 15 - Build: explicitly use .forward for sending notifications
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
  Diff comments   View file @11a49ac
@@ -188,6 +188,12 @@ end @@ -188,6 +188,12 @@ end
188 end 188 end
189 end 189 end
190 190
  191 +legacy_sidekiq_log_file = File.join(gitlab_rails_log_dir, 'sidekiq.log')
  192 +link legacy_sidekiq_log_file do
  193 + to File.join(node['gitlab']['sidekiq']['log_directory'], 'current')
  194 + not_if { File.exists?(legacy_sidekiq_log_file) }
  195 +end
  196 +
191 # Make schema.rb writable for when we run `rake db:migrate` 197 # Make schema.rb writable for when we run `rake db:migrate`
192 file "/opt/gitlab/embedded/service/gitlab-rails/db/schema.rb" do 198 file "/opt/gitlab/embedded/service/gitlab-rails/db/schema.rb" do
193 owner node['gitlab']['user']['username'] 199 owner node['gitlab']['user']['username']