NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: clear environment, do not reset

Browse Source 
Resetting env will make this env unusable with the new orm,
breaking field recomputes logic
This commit is contained in:
Xavier-Do 2020-01-13 16:16:12 +01:00
parent 20f97798d9
commit 3ef33a5320
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot/models/repo.py
View File

@ -458,7 +458,7 @@ class runbot_repo(models.Model):
def _commit(self): def _commit(self):
self.env.cr.commit() self.env.cr.commit()
self.invalidate_cache() self.invalidate_cache()
self.env.reset() self.env.clear()
def _scheduler(self, host): def _scheduler(self, host):
nb_workers = host.get_nb_worker() nb_workers = host.get_nb_worker()
@ -687,7 +687,7 @@ class runbot_repo(models.Model):
self._commit() self._commit()
except Exception as e: except Exception as e:
self.env.cr.rollback() self.env.cr.rollback()
self.env.reset() self.env.clear()
_logger.exception(e) _logger.exception(e)
message = str(e) message = str(e)
if host.last_exception == message: if host.last_exception == message:

4
runbot_builder/builder.py
View File

@ -43,12 +43,12 @@ class RunbotClient():
sleep_time = self.env['runbot.repo']._scheduler_loop_turn(host) sleep_time = self.env['runbot.repo']._scheduler_loop_turn(host)
host.last_end_loop = fields.Datetime.now() host.last_end_loop = fields.Datetime.now()
self.env.cr.commit() self.env.cr.commit()
self.env.reset() self.env.clear()
self.sleep(sleep_time) self.sleep(sleep_time)
except Exception as e: except Exception as e:
_logger.exception('Builder main loop failed with: %s', e) _logger.exception('Builder main loop failed with: %s', e)
self.env.cr.rollback() self.env.cr.rollback()
self.env.reset() self.env.clear()
self.sleep(10) self.sleep(10)
if self.ask_interrupt.is_set(): if self.ask_interrupt.is_set():