From 21ffa283ef266b9cf4e5699cfbd2931565faeb32 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sat, 15 Dec 2018 01:47:22 +0100 Subject: [PATCH] Move healthcheck to python script Signed-off-by: Knut Ahlers --- generateZonefiles.py | 8 ++++++++ zonefile_cron | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/generateZonefiles.py b/generateZonefiles.py index 6647e7b..b1cbdd3 100644 --- a/generateZonefiles.py +++ b/generateZonefiles.py @@ -15,6 +15,7 @@ import consul import dns.resolver import dns.rdatatype import jinja2 +import requests import yaml DEFAULT_TTL = 3600 @@ -131,6 +132,11 @@ def write_zone(zone, ttl, soa, nameserver, mailserver, entries): os.unlink("zones/tmp.{}".format(zone)) +def healthcheck(): + if os.getenv('HC_PING') != '': + requests.get(os.getenv('HC_PING')) + + def main(): zone_data = yaml.load(open("zones.yml")) @@ -155,6 +161,8 @@ def main(): write_zone(zone, ttl, zone_data['soa'], zone_data['nameserver'], mailserver, entries) + healthcheck() + if __name__ == "__main__": main() diff --git a/zonefile_cron b/zonefile_cron index 4ca8e08..3db8609 100755 --- a/zonefile_cron +++ b/zonefile_cron @@ -2,6 +2,4 @@ set -euxo pipefail cd /src -/usr/bin/python3 generateZonefiles.py - -[ -n "${HC_PING}" ] && curl -sSfLo /dev/null "${HC_PING}" +exec /usr/bin/python3 generateZonefiles.py