summaryrefslogtreecommitdiff
path: root/lib/gitlab_projects.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-13 10:27:40 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-13 10:27:40 +0200
commitec7d37b4a39e99a861b075269beceecfada73a09 (patch)
tree8121d69cd625bf7a1d937a4df3c40a77fda4e5bd /lib/gitlab_projects.rb
parent01a74127435fe32ef5aa6bf43000796c6f9c2ab6 (diff)
downloadgitlab-shell-ec7d37b4a39e99a861b075269beceecfada73a09.tar.gz
Add process wait for import
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/gitlab_projects.rb')
-rw-r--r--lib/gitlab_projects.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index 3afbe64..4067d13 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -109,8 +109,10 @@ class GitlabProjects
Process.wait(pid)
end
rescue Timeout::Error
- Process.kill('KILL', pid)
$logger.error "Importing project #{@project_name} from <#{@source}> failed due to timeout."
+
+ Process.kill('KILL', pid)
+ Process.wait
FileUtils.rm_rf(full_path)
false
else