aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/mgagit
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-02-10 10:33:27 +0000
committerColin Guthrie <colin@mageia.org>2014-02-10 10:33:27 +0000
commitced6c8e9329c93ee1f5535b850cac80774ff86d3 (patch)
treed86fb42ad096fe99faea4bf1db0866d9a53e8a31 /deployment/mgagit
parentad0f39ebdf9f60dffc4765751014c3219d11dc31 (diff)
downloadpuppet-ced6c8e9329c93ee1f5535b850cac80774ff86d3.tar
puppet-ced6c8e9329c93ee1f5535b850cac80774ff86d3.tar.gz
puppet-ced6c8e9329c93ee1f5535b850cac80774ff86d3.tar.bz2
puppet-ced6c8e9329c93ee1f5535b850cac80774ff86d3.tar.xz
puppet-ced6c8e9329c93ee1f5535b850cac80774ff86d3.zip
mgagit: Use a 5 second timeout to notify alamut.
This keeps the stall time on a push to something sensible should there be a problem.
Diffstat (limited to 'deployment/mgagit')
-rwxr-xr-xdeployment/mgagit/templates/git-post-receive-hook2
1 files changed, 1 insertions, 1 deletions
diff --git a/deployment/mgagit/templates/git-post-receive-hook b/deployment/mgagit/templates/git-post-receive-hook
index f0efaf9c..c33c8a7e 100755
--- a/deployment/mgagit/templates/git-post-receive-hook
+++ b/deployment/mgagit/templates/git-post-receive-hook
@@ -187,7 +187,7 @@ if __name__ == '__main__':
try:
req = urllib2.Request('http://alamut.mageia.org:8000', repo_shortname() + '.git')
req.add_header('Content-Type', 'x-git/repo')
- fp = urllib2.urlopen(req)
+ fp = urllib2.urlopen(req, timeout=5)
if (fp):
fp.close()
except Exception: