From ac7cf53481fb33721c84888a461258b99d9f8515 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Sat, 9 Nov 2013 12:51:13 -0800 Subject: [PATCH] Add missing logger.info messages. Reduce a debug message being printed multiple times. --- gkeyldap/actions.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gkeyldap/actions.py b/gkeyldap/actions.py index 7ffa094..07130eb 100644 --- a/gkeyldap/actions.py +++ b/gkeyldap/actions.py @@ -74,6 +74,8 @@ class Actions(object): self.output(dev, devs[dev]) self.output("============================================") self.output("Total number of devs in results:", len(devs)) + self.logger.info("============================================") + self.logger.info("Total number of devs in results: %d" % len(devs)) return True @@ -83,6 +85,7 @@ class Actions(object): l = LdapSearch() if not l.connect(): self.output("Aborting Update...Connection failed") + self.logger.info("Aborting Update...Connection failed") return False results = l.search('*', UID) info = l.result2dict(results, 'uid') @@ -91,24 +94,25 @@ class Actions(object): if not self.create_seedfile(info): self.logger.error("Dev seed file update failure: " "Original seed file is intact & untouched.") - old = self.config['dev-seedfile'] + '.old' + filename = self.config['dev-seedfile'] + old = filename + '.old' try: self.output("Backing up existing file...") + self.logger.info("Backing up existing file...") if os.path.exists(old): self.logger.debug( "MAIN: _action_updateseeds; Removing 'old' seed file: %s" % old) os.unlink(old) - if os.path.exists(self.config['dev-seedfile']): + if os.path.exists(filename): self.logger.debug( "MAIN: _action_updateseeds; Renaming current seed file to: " "%s" % old) - os.rename(self.config['dev-seedfile'], old) + os.rename(filename, old) self.logger.debug( "MAIN: _action_updateseeds; Renaming '.new' seed file to: %s" - % self.config['dev-seedfile']) - os.rename(self.config['dev-seedfile'] + '.new', - self.config['dev-seedfile']) + % filename) + os.rename(filename + '.new', filename) except IOError: raise self.output("Developer Seed file updated") @@ -132,6 +136,8 @@ class Actions(object): count += 1 self.output("Total number of seeds created:", count) self.output("Seeds created...saving file: %s" % filename) + self.logger.info("Total number of seeds created: %d" % count) + self.logger.info("Seeds created...saving file: %s" % filename) return self.seeds.save() -- 2.26.2