Merge branch 'feature/project-export' into feature/project-import
This commit is contained in:
commit
45032bf403
|
@ -3,7 +3,7 @@ module Gitlab
|
|||
extend self
|
||||
|
||||
def export_path(relative_path:)
|
||||
File.join(storage_path, relative_path, "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_gitlab_export")
|
||||
File.join(storage_path, relative_path)
|
||||
end
|
||||
|
||||
def project_atts
|
||||
|
@ -18,8 +18,6 @@ module Gitlab
|
|||
Gitlab::ImportExport::ImportExportReader.project_tree
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def storage_path
|
||||
File.join(Settings.shared['path'], 'tmp/project_exports')
|
||||
end
|
||||
|
|
|
@ -31,7 +31,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def archive_file
|
||||
@archive_file ||= File.join(@storage_path, '..', 'project.tar.gz')
|
||||
@archive_file ||= File.join(@storage_path, '..', "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_project_export.tar.gz")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -29,8 +29,8 @@ module Gitlab
|
|||
"in #{GRACE_TIME} seconds"
|
||||
sleep(GRACE_TIME)
|
||||
|
||||
Sidekiq.logger.warn "sending SIGUSR1 to PID #{Process.pid}"
|
||||
Process.kill('SIGUSR1', Process.pid)
|
||||
Sidekiq.logger.warn "sending SIGTERM to PID #{Process.pid}"
|
||||
Process.kill('SIGTERM', Process.pid)
|
||||
|
||||
Sidekiq.logger.warn "waiting #{SHUTDOWN_WAIT} seconds before sending "\
|
||||
"#{SHUTDOWN_SIGNAL} to PID #{Process.pid}"
|
||||
|
|
Loading…
Reference in New Issue