From 8a52a6c193410f0d9fb8ffd215054600cd7d1b8f Mon Sep 17 00:00:00 2001 From: Herklos Date: Mon, 7 Oct 2019 20:53:16 +0200 Subject: [PATCH] [Version] v1.2.1 --- CHANGELOG.md | 4 ++++ README.md | 2 +- octobot_evaluators/__init__.py | 2 +- octobot_evaluators/channels/matrix.py | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b3914cb..0e197f8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.2.1] - 2019-10-07 +## Changed +- Improved matrix channel cancelling management + ## [1.2.0] - 2019-10-05 ## Added - Evaluator types management diff --git a/README.md b/README.md index 66f75322..e8136fc2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OctoBot-Evaluators [1.2.0-beta](https://github.com/Drakkar-Software/OctoBot-Evaluators/blob/master/CHANGELOG.md) +# OctoBot-Evaluators [1.2.1-beta](https://github.com/Drakkar-Software/OctoBot-Evaluators/blob/master/CHANGELOG.md) [![PyPI](https://img.shields.io/pypi/v/OctoBot-Evaluators.svg)](https://pypi.python.org/pypi/OctoBot-Evaluators/) [![Build Status](https://travis-ci.com/Drakkar-Software/OctoBot-Evaluators.svg?branch=master)](https://travis-ci.org/Drakkar-Software/OctoBot-Evaluators) [![Build status](https://ci.appveyor.com/api/projects/status/p68n2y6547xhw0t6?svg=true)](https://ci.appveyor.com/project/Herklos/octobot-evaluators) diff --git a/octobot_evaluators/__init__.py b/octobot_evaluators/__init__.py index c7a106be..4e368fc6 100644 --- a/octobot_evaluators/__init__.py +++ b/octobot_evaluators/__init__.py @@ -15,4 +15,4 @@ # License along with this library. PROJECT_NAME = "OctoBot-Evaluators" -VERSION = "1.2.0" # major.minor.revision +VERSION = "1.2.1" # major.minor.revision diff --git a/octobot_evaluators/channels/matrix.py b/octobot_evaluators/channels/matrix.py index 77290b84..f7b234d5 100644 --- a/octobot_evaluators/channels/matrix.py +++ b/octobot_evaluators/channels/matrix.py @@ -14,6 +14,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library. +from asyncio import CancelledError from octobot_channels import CHANNEL_WILDCARD from octobot_channels.channels.channel import Channel @@ -33,6 +34,8 @@ async def consume(self): while not self.should_stop: try: await self.callback(**(await self.queue.get())) + except CancelledError: + self.logger.warning("Cancelled task") except Exception as e: self.logger.exception(f"Exception when calling callback : {e}")