Merge branch 'sidekiq_log' into 'master'

Fix missing sidekiq.log in the admin interface See merge request !182

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