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: fix invalid type argument when calling _log method

Browse Source
This commit is contained in:
Christophe Monniez 2020-03-10 17:07:47 +01:00
parent 3e40c38e89
commit 1fca89e3fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runbot/models/build.py
View File

@ -662,10 +662,10 @@ class runbot_build(models.Model):
if build.requested_action == 'wake_up': if build.requested_action == 'wake_up':
if docker_state(build._get_docker_name(), build._path()) == 'RUNNING': if docker_state(build._get_docker_name(), build._path()) == 'RUNNING':
build.write({'requested_action': False, 'local_state': 'running'}) build.write({'requested_action': False, 'local_state': 'running'})
build._log('wake_up', 'Waking up failed, **docker is already running**', type='markdown', level='SEPARATOR') build._log('wake_up', 'Waking up failed, **docker is already running**', log_type='markdown', level='SEPARATOR')
elif not os.path.exists(build._path()): elif not os.path.exists(build._path()):
build.write({'requested_action': False, 'local_state': 'done'}) build.write({'requested_action': False, 'local_state': 'done'})
build._log('wake_up', 'Impossible to wake-up, **build dir does not exists anymore**', type='markdown', level='SEPARATOR') build._log('wake_up', 'Impossible to wake-up, **build dir does not exists anymore**', log_type='markdown', level='SEPARATOR')
else: else:
try: try:
log_path = build._path('logs', 'wake_up.txt') log_path = build._path('logs', 'wake_up.txt')
@ -679,7 +679,7 @@ class runbot_build(models.Model):
'local_state': 'running', 'local_state': 'running',
'port': port, 'port': port,
}) })
build._log('wake_up', '**Waking up build**', type='markdown', level='SEPARATOR') build._log('wake_up', '**Waking up build**', log_type='markdown', level='SEPARATOR')
self.env['runbot.build.config.step']._run_odoo_run(build, log_path) self.env['runbot.build.config.step']._run_odoo_run(build, log_path)
# reload_nginx will be triggered by _run_odoo_run # reload_nginx will be triggered by _run_odoo_run
except Exception: except Exception:

2
runbot/models/build_config.py
View File

@ -205,7 +205,7 @@ class ConfigStep(models.Model):
def _run(self, build): def _run(self, build):
log_path = build._path('logs', '%s.txt' % self.name) log_path = build._path('logs', '%s.txt' % self.name)
build.write({'job_start': now(), 'job_end': False}) # state, ... build.write({'job_start': now(), 'job_end': False}) # state, ...
build._log('run', 'Starting step **%s** from config **%s**' % (self.name, build.config_id.name), type='markdown', level='SEPARATOR') build._log('run', 'Starting step **%s** from config **%s**' % (self.name, build.config_id.name), log_type='markdown', level='SEPARATOR')
return self._run_step(build, log_path) return self._run_step(build, log_path)
def _run_step(self, build, log_path): def _run_step(self, build, log_path):