From a10fa2e45ae83638c8824ae36a763468667c340d Mon Sep 17 00:00:00 2001 From: Nathan Denny Date: Fri, 23 May 2025 13:32:12 -0400 Subject: [PATCH] minor code minimization --- bin/bastion.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/bastion.py b/bin/bastion.py index c89c5da..0b811a7 100755 --- a/bin/bastion.py +++ b/bin/bastion.py @@ -105,7 +105,7 @@ def __init__(self): def configured(self): for folder in App.CONF_SEARCH_ORDER: folder = folder.expanduser() - for confile in folder.rglob("conf-*.yaml"): + for confile in sorted(folder.rglob("conf-*.yaml")): self.info("reading conf from {}".format(str(folder / confile))) self.conf.load(folder / confile) return self @@ -994,20 +994,19 @@ def do_become_conductor(self, request): if zone.dynamic: ecommand = '{}/bastion.py enroll assets "{}"'.format(str(BIN_PATH), str(zone.ARK)) if not simulated: - logger.debug("executing... {}".format(str(ecommand))) + logger.debug("executing... {}".format(ecommand)) os.system(ecommand) else: - logger.debug("simulating... {}".format(str(ecommand))) + logger.debug("simulating... {}".format(ecommand)) for site in self.sites: #-- Queue assets for updates for all of the sites that I'm managing... for zone in site.zones: qcommand = '{}/bastion.py queue assets "{}"'.format(str(BIN_PATH), str(zone.ARK)) - logger.debug("executing... {}".format(str(qcommand))) if not simulated: - logger.debug("simulating... {}".format(str(qcommand))) + logger.debug("executing... {}".format(qcommand)) os.system(qcommand) else: - logger.debug("simulating... {}".format(str(qcommand))) + logger.debug("simulating... {}".format(qcommand)) for site in self.sites: #-- Spawn a subprocess to pop all of the objects in the queue for each siteXzone combo.... for zone in site.zones: @@ -1017,10 +1016,10 @@ def do_become_conductor(self, request): #-- i.e. disk access for banking is only done when no other processes need the disk. bcommand = "{} -c 3 -t {}".format(str(IONICE), bcommand) if not simulated: - logger.debug("executing... {}".format(str(bcommand))) + logger.debug("executing... {}".format(bcommand)) os.system(bcommand) else: - logger.debug("simulating... {}".format(str(bcommand))) + logger.debug("simulating... {}".format(bcommand)) lastCheckIn = datetime.datetime.now()