summaryrefslogtreecommitdiff
path: root/git-mirror-gitlab-ce
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-06-19 13:27:19 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-06-19 13:27:19 -0400
commit5ede220a6da2cb73a6052198ec5fe9c0b749edd6 (patch)
tree234da857952558505ab0521f75eea382791f2627 /git-mirror-gitlab-ce
parent31933c806f2041cd95b1d863bee31b35a642fd35 (diff)
Tidy the gitlab request pooling code
Diffstat (limited to 'git-mirror-gitlab-ce')
-rwxr-xr-xgit-mirror-gitlab-ce12
1 files changed, 8 insertions, 4 deletions
diff --git a/git-mirror-gitlab-ce b/git-mirror-gitlab-ce
index dc7a4db..40f864a 100755
--- a/git-mirror-gitlab-ce
+++ b/git-mirror-gitlab-ce
@@ -39,6 +39,10 @@ class GitLabCE < GitMirrorBackend
return @connections[key]
end
+ def request(req)
+ return self.connection(req.uri).request(req)
+ end
+
def finish
@connections.each do |k,v|
v.finish()
@@ -69,7 +73,7 @@ class GitLabCE < GitMirrorBackend
unless @cache.has_key?(:info)
req = Net::HTTP::Get.new(@gl.config['apiurl'] + "projects/" + CGI::escape(@project_id))
req.add_field("PRIVATE-TOKEN", @gl.config['apikey'])
- res = @gl.connection(req.uri).request(req)
+ res = @gl.request(req)
case res.code
when "200"
@cache[:info] = JSON::parse(res.body)
@@ -115,7 +119,7 @@ class GitLabCE < GitMirrorBackend
map["import_url"] = mirror
end
req.body = JSON::dump(map)
- res = @gl.connection(req.uri).request(req)
+ res = @gl.request(req)
if res.code != "201"
raise Error.new([res, res.body])
end
@@ -140,7 +144,7 @@ class GitLabCE < GitMirrorBackend
req.add_field("PRIVATE-TOKEN", @gl.config['apikey'])
req.add_field("Content-Type", "application/json")
req.body = JSON::dump(map)
- res = @gl.connection(req.uri).request(req)
+ res = @gl.request(req)
if res.code != "200"
raise Error.new([res, res.body])
end
@@ -152,7 +156,7 @@ class GitLabCE < GitMirrorBackend
def namespace_path2id(path, pageno=1)
req = Net::HTTP::Get.new(@gl.config['apiurl'] + "namespaces?page=#{pageno}&search=#{CGI::escape(path)}")
req.add_field("PRIVATE-TOKEN", @gl.config['apikey'])
- res = @gl.connection(req.uri).request(req)
+ res = @gl.request(req)
if res.code != "200"
raise Error.new([res, res.body])
end