From b0f764f96d0aaa75c96b01b9538592fc741904da Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Thu, 7 Feb 2019 22:20:02 +0100 Subject: [PATCH] Update varnishpurge trigger to use requests and be py3 --- triggers.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/triggers.py b/triggers.py index 5155185..c78aab7 100644 --- a/triggers.py +++ b/triggers.py @@ -1,12 +1,12 @@ +import requests + + class test(object): def __init__(self, cfg): pass def pushtrigger(self, reponame, username): - print "Firing push trigger for repository '%s', due to push by %s" % (reponame, username) - - -import httplib + print("Firing push trigger for repository '%s', due to push by %s" % (reponame, username)) class varnishpurger(object): @@ -32,17 +32,19 @@ class varnishpurger(object): '^/gitweb/\?p=%s.git' % reponame, '^/git/%s' % reponame]: if not self._internal_purge(u): - print "Varnish purge failed, website may become slightly out of date" + print("Varnish purge failed, website may become slightly out of date") return def _internal_purge(self, url): try: - conn = httplib.HTTPConnection(self.host) - conn.request("GET", "/varnish-purge-url", '', {'X-Purge-URL': url}) - resp = conn.getresponse() - conn.close() - if resp.status == 200: + resp = requests.get( + "http://{0}/varnish-purge-url".format(self.host), + headers={ + 'X-Purge-URL': url, + } + ) + if resp.status_code == 200: return True return False - except Exception, ex: + except Exception as ex: return False -- 2.39.5