diff --git a/util/kojira b/util/kojira index 27c9e82f..f278c610 100755 --- a/util/kojira +++ b/util/kojira @@ -481,7 +481,7 @@ class RepoManager(object): self.logger.info('regenLoop starting') try: while True: - self.regenRepos() + self.session.repo.checkQueue() time.sleep(self.options.sleeptime) except Exception: self.logger.exception('Error in regen thread') @@ -489,6 +489,21 @@ class RepoManager(object): finally: session.logout() + def autoregenLoop(self, session): + """Triggers automatic regens as needed/possible. Runs in a separate thread""" + self.session = session + self.logger = logging.getLogger("koji.repo.autoregen") + self.logger.info('autoregenLoop starting') + try: + while True: + self.session.repo.autoRequests() + time.sleep(self.options.sleeptime) + except Exception: + self.logger.exception('Error in auto regen thread') + raise + finally: + session.logout() + def rmtreeLoop(self, session): self.session = session logger = logging.getLogger("koji.repo.rmtree") @@ -649,11 +664,6 @@ class RepoManager(object): elif repo.state == koji.REPO_PROBLEM: repo.handle_problem() - def regenRepos(self): - """Trigger repo requests as needed""" - self.session.repo.autoRequests() - self.session.repo.checkQueue() - def start_currency_checker(session, repomgr): subsession = session.subsession()