root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

even more debug

This commit is contained in:
James Lopez 2016-07-06 10:29:31 +02:00
parent 4a62a11f20
commit 95f630daeb
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/gitlab/import_export/command_line_util.rb
View File

@ -28,7 +28,8 @@ module Gitlab
end
def execute(cmd)
_output, status = Gitlab::Popen.popen(cmd)
output, status = Gitlab::Popen.popen(cmd)
@shared.error(output.to_s) unless status_zero?
status.zero?
end

1
lib/gitlab/import_export/saver.rb
View File

@ -17,6 +17,7 @@ module Gitlab
Rails.logger.info("Saved project export #{archive_file}")
archive_file
else
@shared.error("Unable to save #{archive_file} into #{@shared.export_path}")
false
end
rescue => e

4
lib/gitlab/sidekiq_middleware/memory_killer.rb
View File

@ -29,11 +29,11 @@ module Gitlab
"in #{GRACE_TIME} seconds"
sleep(GRACE_TIME)
Sidekiq.logger.warn "sending SIGTERM to PID #{Process.pid}"
Sidekiq.logger.warn "sending SIGTERM to PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']}"
Process.kill('SIGTERM', Process.pid)
Sidekiq.logger.warn "waiting #{SHUTDOWN_WAIT} seconds before sending "\
"#{SHUTDOWN_SIGNAL} to PID #{Process.pid}"
"#{SHUTDOWN_SIGNAL} to PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']}"
sleep(SHUTDOWN_WAIT)
Sidekiq.logger.warn "sending #{SHUTDOWN_SIGNAL} to PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']}"