From c8efbe54c7a68977b7f8f0514bb13db336cea74e Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 5 Feb 2018 15:13:39 +0100 Subject: [PATCH] Changing output about starting and ending --- pp_lib/deploy_zones_from_pdns.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pp_lib/deploy_zones_from_pdns.py b/pp_lib/deploy_zones_from_pdns.py index afba2ef..fb0d533 100644 --- a/pp_lib/deploy_zones_from_pdns.py +++ b/pp_lib/deploy_zones_from_pdns.py @@ -30,6 +30,7 @@ from functools import cmp_to_key import six from six import reraise import requests +from pytz import timezone, UnknownTimeZoneError from six.moves.urllib.parse import urlunsplit @@ -44,7 +45,7 @@ from .pdns_record import compare_rrsets from .pidfile import PidFileError, InvalidPidFileError, PidFileInUseError, PidFile -__version__ = '0.5.2' +__version__ = '0.5.3' LOG = logging.getLogger(__name__) @@ -307,6 +308,9 @@ class PpDeployZonesApp(PpPDNSApplication): super(PpDeployZonesApp, self).post_init() self.initialized = False + if not self.quiet: + print('') + LOG.debug("Post init phase.") LOG.debug("Checking for masters, which are local addresses ...") @@ -320,7 +324,8 @@ class PpDeployZonesApp(PpPDNSApplication): "Address {!r} not in list of local addresses.".format(addr)) ext_masters.append(addr) self.zone_masters = ext_masters - LOG.info("Using list of masters for slave zones:\n{}".format(pp(self.zone_masters))) + LOG.info("Using masters for slave zones: {}".format( + ', '.join(map(lambda x: '{!r}'.format(x), self.zone_masters)))) self.pidfile = PidFile( filename=self.pidfile_name, appname=self.appname, verbose=self.verbose, @@ -347,6 +352,15 @@ class PpDeployZonesApp(PpPDNSApplication): # ------------------------------------------------------------------------- def _run(self): + local_tz_name = 'Europe/Berlin' + if 'TZ' in os.environ and os.environ['TZ']: + local_tz_name = os.environ['TZ'] + try: + local_tz = timezone(local_tz_name) + except UnknownTimeZoneError: + LOG.error("Unknown time zone: {!r}.".format(local_tz_name)) + self.exit(6) + my_uid = os.geteuid() if my_uid: msg = "You must be root to execute this script." @@ -366,7 +380,8 @@ class PpDeployZonesApp(PpPDNSApplication): try: - LOG.info("Here we go again ...") + LOG.info("Starting: {}".format( + datetime.datetime.now(local_tz).strftime('%Y-%m-%d %H:%M:%S %Z'))) self.zones = self.get_api_zones() self.zones.sort(key=lambda x: cmp_to_key(compare_fqdn)(x.name_unicode)) @@ -388,6 +403,8 @@ class PpDeployZonesApp(PpPDNSApplication): finally: self.cleanup() self.pidfile = None + LOG.info("Ending: {}".format( + datetime.datetime.now(local_tz).strftime('%Y-%m-%d %H:%M:%S %Z'))) # ------------------------------------------------------------------------- def cleanup(self): -- 2.39.5