diff options
Diffstat (limited to 'lib/gitlab_projects.rb')
| -rw-r--r-- | lib/gitlab_projects.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb index 505b49e..f24fb26 100644 --- a/lib/gitlab_projects.rb +++ b/lib/gitlab_projects.rb @@ -113,16 +113,21 @@ class GitlabProjects def push_branches remote_name = ARGV.shift + # timeout for push + timeout = (ARGV.shift || 120).to_i + $logger.info "Pushing branches from #{full_path} to remote #{remote_name}: #{ARGV}" cmd = %W(git --git-dir=#{full_path} push -- #{remote_name}).concat(ARGV) pid = Process.spawn(*cmd) begin - Process.wait(pid) + Timeout.timeout(timeout) do + Process.wait(pid) + end $?.exitstatus.zero? - rescue => exception - $logger.error "Pushing branches to remote #{remote_name} failed due to: #{exception.message}" + rescue Timeout::Error + $logger.error "Pushing branches to remote #{remote_name} failed due to timeout." Process.kill('KILL', pid) Process.wait @@ -204,8 +209,7 @@ class GitlabProjects tags_option = ARGV.include?('--no-tags') ? '--no-tags' : '--tags' $logger.info "Fetching remote #{@name} for project #{@project_name}." - cmd = %W(git --git-dir=#{full_path} fetch #{@name}) - cmd << '--prune' + cmd = %W(git --git-dir=#{full_path} fetch #{@name} --prune) cmd << '--force' if forced cmd << tags_option pid = Process.spawn(*cmd) |