diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-06-26 10:45:55 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-06-27 17:13:08 +0200 |
| commit | d82c52da7a0e0b5504203775ccdf30998777715f (patch) | |
| tree | d2a7b926158a0e54ac819d9b3c572472d62f88b3 /scripts | |
| parent | 9123fd011676ca842b46c1767cea3cd6288fff66 (diff) | |
Simplify jira bot: we now always get an event instance
Change-Id: Ifbbad62d0068e6955fe547c1bbf8a1e895a0b140
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/jira/jira-bug-closer/bot/bot.py | 5 | ||||
| -rw-r--r-- | scripts/jira/jira-bug-closer/gerrit/streamparser.py | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/scripts/jira/jira-bug-closer/bot/bot.py b/scripts/jira/jira-bug-closer/bot/bot.py index e22c4045..2da80d66 100644 --- a/scripts/jira/jira-bug-closer/bot/bot.py +++ b/scripts/jira/jira-bug-closer/bot/bot.py @@ -62,9 +62,8 @@ class Bot: async def event_handler(self, data: str) -> None: event = self.parser.parse(data) - log.debug(event) - log.debug("Raw data: >>>%s<<<", data) - if event and event.is_branch_update(): + log.debug(f"Gerrit Event: {event} - raw data: >>>{data}<<<") + if event.is_branch_update(): log.info(event) await self.update_project(event.project) diff --git a/scripts/jira/jira-bug-closer/gerrit/streamparser.py b/scripts/jira/jira-bug-closer/gerrit/streamparser.py index e9475c3b..c7b071d8 100644 --- a/scripts/jira/jira-bug-closer/gerrit/streamparser.py +++ b/scripts/jira/jira-bug-closer/gerrit/streamparser.py @@ -28,7 +28,6 @@ ############################################################################# import json -from typing import Optional from logger import logger log = logger(name="gerrit_stream_parser") @@ -57,7 +56,7 @@ class GerritEvent: class GerritStreamParser: - def parse(self, data: str) -> Optional[GerritEvent]: + def parse(self, data: str) -> GerritEvent: try: event = json.loads(data) except json.decoder.JSONDecodeError: |