From ba1a8ee0894a44700e2d5c5ff83103e33ed262b0 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 13 Jan 2021 15:48:39 +0100 Subject: [PATCH] [IMP] runbot_merge, forwardport: update some logging Downgrade an error and a warning to info, and upgrade two warnings to error. Point is to improve logic of log levels & sentry visibility. Fixes #258 --- forwardport/models/project.py | 4 ++-- runbot_merge/controllers/__init__.py | 2 +- runbot_merge/models/pull_requests.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forwardport/models/project.py b/forwardport/models/project.py index 5c917917..6f66b2c7 100644 --- a/forwardport/models/project.py +++ b/forwardport/models/project.py @@ -74,7 +74,7 @@ class Project(models.Model): 'Authorization': 'token %s' % project.fp_github_token }) if not (r0.ok and r1.ok): - _logger.warning("Failed to fetch bot information for project %s: %s", project.name, (r0.text or r0.content) if not r0.ok else (r1.text or r1.content)) + _logger.error("Failed to fetch bot information for project %s: %s", project.name, (r0.text or r0.content) if not r0.ok else (r1.text or r1.content)) continue project.fp_github_name = r0.json()['login'] project.fp_github_email = next(( @@ -587,7 +587,7 @@ class PullRequests(models.Model): notarget = [p.repository.name for p in self if not p.repository.fp_remote_target] if notarget: - _logger.warning( + _logger.error( "Can not forward-port %s: repos %s don't have a remote configured", self, ', '.join(notarget) ) diff --git a/runbot_merge/controllers/__init__.py b/runbot_merge/controllers/__init__.py index c0e51088..3e2a233b 100644 --- a/runbot_merge/controllers/__init__.py +++ b/runbot_merge/controllers/__init__.py @@ -160,7 +160,7 @@ def handle_pr(env, event): pr_obj = env['runbot_merge.pull_requests']._get_or_schedule(r, pr['number']) if not pr_obj: - _logger.warning("webhook %s on unknown PR %s#%s, scheduled fetch", event['action'], repo.name, pr['number']) + _logger.info("webhook %s on unknown PR %s#%s, scheduled fetch", event['action'], repo.name, pr['number']) return "Unknown PR {}:{}, scheduling fetch".format(repo.name, pr['number']) if event['action'] == 'synchronize': if pr_obj.head == pr['head']['sha']: diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 6e300d53..5ed05ad4 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -1691,7 +1691,7 @@ class Stagings(models.Model): }) def fail(self, message, prs=None): - _logger.error("Staging %s failed: %s", self, message) + _logger.info("Staging %s failed: %s", self, message) prs = prs or self.batch_ids.prs prs.write({'state': 'error'}) for pr in prs: