From 9ae816a23d42a57a6aecd10495fe1506bbba0766 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Wed, 18 Dec 2019 17:27:33 +0100 Subject: [PATCH] [IMP] runbot: add some log --- runbot/models/repo.py | 3 ++- runbot_builder/builder.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/runbot/models/repo.py b/runbot/models/repo.py index f769e5d3..12004a2c 100644 --- a/runbot/models/repo.py +++ b/runbot/models/repo.py @@ -748,13 +748,14 @@ class runbot_repo(models.Model): pass def _docker_cleanup(self): + _logger.info('Docker cleaning') docker_ps_result = docker_ps() containers = {int(dc.split('-', 1)[0]):dc for dc in docker_ps_result if dest_reg.match(dc)} if containers: candidates = self.env['runbot.build'].search([('id', 'in', list(containers.keys())), ('local_state', '=', 'done')]) for c in candidates: _logger.info('container %s found running with build state done', containers[c.id]) - docker_stop(containers[c.id]) + docker_stop(containers[c.id], c._path()) ignored = {dc for dc in docker_ps_result if not dest_reg.match(dc)} if ignored: _logger.debug('docker (%s) not deleted because not dest format', " ".join(list(ignored))) diff --git a/runbot_builder/builder.py b/runbot_builder/builder.py index a9b20e97..49559a8a 100755 --- a/runbot_builder/builder.py +++ b/runbot_builder/builder.py @@ -37,6 +37,7 @@ class RunbotClient(): self.env['runbot.build']._local_cleanup() self.env['runbot.repo']._docker_cleanup() host.set_psql_conn_count() + _logger.debug('Scheduling...') count += 1 sleep_time = self.env['runbot.repo']._scheduler_loop_turn(host) host.last_end_loop = fields.Datetime.now()