CLI: support a timout option

python-gitlab · Oct 26, 2014 · 1672529 · 1672529 · godmar · Feb 5, 2015
1 parent 9744475
commit 1672529
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -14,3 +14,4 @@ Koen Smets <koen.smets@gmail.com>
 Mart Sõmermaa <mart.somermaa@cgi.com>
 Diego Giovane Pasqualin <dpasqualin@c3sl.ufpr.br>
 Crestez Dan Leonard <lcrestez@ixiacom.com>
+Patrick Miller <patrick@velocitywebworks.com>
diff --git a/gitlab b/gitlab
@@ -141,7 +141,7 @@ def usage():
 def do_auth():
     try:
         gl = gitlab.Gitlab(gitlab_url, private_token=gitlab_token,
-                           ssl_verify=ssl_verify)
+                           ssl_verify=ssl_verify, timeout=timeout)
         gl.auth()
     except:
         die("Could not connect to GitLab (%s)" % gitlab_url)
@@ -247,6 +247,7 @@ def do_project_owned():
 
 
 ssl_verify = True
+timeout = 60
 gitlab_id = None
 verbose = False
 
@@ -325,6 +326,15 @@ try:
 except:
     pass
 
+try:
+    timeout = config.getboolean('global', 'timeout')
+except:
+    pass
+try:
+    timeout = config.getboolean(gitlab_id, 'timeout')
+except:
+    pass
+
 try:
     what = args.pop(0)
     action = args.pop(0)