From 8f6404d0b1746867749f27ba98534b14935dc981 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Thu, 13 May 2021 21:49:01 +0200 Subject: [PATCH] Revert "Support for custom timeout on MQTT message publish" (already implemented in the current logic) --- CHANGELOG.md | 5 ----- platypush/plugins/zwave/mqtt.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 195e60db8..4eb3f6936 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,11 +21,6 @@ Given the high speed of development in the first phase, changes are being report - `switch.switchbot` plugin renamed to `switchbot.bluetooth` plugin, while the new plugin that uses the Switchbot API is simply named `switchbot`. -### Fixed - -- Added new sleep and heart rate read permissions/scopes to the Google Fit integration required - by the new Fit's policies. - ## [0.21.0] - 2021-05-06 ### Added diff --git a/platypush/plugins/zwave/mqtt.py b/platypush/plugins/zwave/mqtt.py index d6abaf580..1fb12bfa7 100644 --- a/platypush/plugins/zwave/mqtt.py +++ b/platypush/plugins/zwave/mqtt.py @@ -46,7 +46,7 @@ class ZwaveMqttPlugin(MqttPlugin, ZwaveBasePlugin): """ def __init__(self, name: str, host: str = 'localhost', port: int = 1883, topic_prefix: str = 'zwave', - timeout: int = 60, tls_certfile: Optional[str] = None, tls_keyfile: Optional[str] = None, + timeout: int = 10, tls_certfile: Optional[str] = None, tls_keyfile: Optional[str] = None, tls_version: Optional[str] = None, tls_ciphers: Optional[str] = None, username: Optional[str] = None, password: Optional[str] = None, **kwargs): """ @@ -125,7 +125,7 @@ class ZwaveMqttPlugin(MqttPlugin, ZwaveBasePlugin): payload = json.dumps({'args': args}) ret = self._parse_response( self.publish(topic=self._api_topic(api) + '/set', msg=payload, reply_topic=self._api_topic(api), - **self._mqtt_args(**kwargs), timeout=self.timeout)) + **self._mqtt_args(**kwargs))) assert not ret or ret.get('success') is True, ret.get('message') return ret.get('result')