Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop timeout thread when device is disconnected #4

Closed
wants to merge 2 commits into from
Closed

Stop timeout thread when device is disconnected #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9733af
Stop timeout thread when device is disconnected
bodiroga Jul 5, 2019
2b68314
Do not stop loop on disconnect
bodiroga Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions tb_device_mqtt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
from jsonschema import Draft7Validator
import ssl
from jsonschema import ValidationError
from threading import Lock
from threading import Thread
import threading

KV_SCHEMA = {
"type": "object",
Expand Down Expand Up @@ -119,12 +118,10 @@ def __init__(self, host, token=None):
log.warning("token is not set, connection without tls wont be established")
else:
self._client.username_pw_set(token)
self._lock = Lock()
self._lock = threading.Lock()
self._attr_request_dict = {}
self.__timeout_queue = queue.Queue()
self.__timeout_thread = Thread(target=self.__timeout_check)
self.__timeout_thread.daemon = True
self.__timeout_thread.start()
self.__timeout_thread = None
self.__is_connected = False
self.__device_on_server_side_rpc_response = None
self.__connect_callback = None
Expand All @@ -134,6 +131,7 @@ def __init__(self, host, token=None):
self.__device_client_rpc_dict = {}
self.__attr_request_number = 0
self._client.on_connect = self._on_connect
self._client.on_disconnect = self._on_disconnect
self._client.on_log = self._on_log
self._client.on_publish = self._on_publish
self._client.on_message = self._on_message
Expand Down Expand Up @@ -172,6 +170,10 @@ def _on_connect(self, client, userdata, flags, rc, *extra_params):
else:
log.error("connection FAIL with unknown error")

def _on_disconnect(self, client, userdata, rc):
log.debug("MQTT client disconnected")
self.__is_connected = False

def connect(self, callback=None, min_reconnect_delay=1, timeout=120, tls=False, port=1883, ca_certs=None, cert_file=None, key_file=None):
if tls:
self._client.tls_set(ca_certs=ca_certs,
Expand All @@ -185,9 +187,16 @@ def connect(self, callback=None, min_reconnect_delay=1, timeout=120, tls=False,
self._client.loop_start()
self.__connect_callback = callback
self.reconnect_delay_set(min_reconnect_delay, timeout)
self.__timeout_thread = threading.Thread(target=self.__timeout_check)
self.__timeout_thread.do_run = True
self.__timeout_thread.start()

def disconnect(self):
self._client.disconnect()
if self.__timeout_thread:
self.__timeout_thread.do_run = False
self.__timeout_thread.join()
self.__timeout_thread = None
log.info("Disconnected from ThingsBoard!")

def _on_message(self, client, userdata, message):
Expand Down Expand Up @@ -359,11 +368,16 @@ def _add_attr_request_callback(self, callback):
return attr_request_number

def __timeout_check(self):
while True:
t = threading.currentThread()
while getattr(t, "do_run", True):
try:
item = self.__timeout_queue.get()
try:
item = self.__timeout_queue.get(False)
except queue.Empty:
time.sleep(0.1)
continue
if item is not None:
while True:
while getattr(t, "do_run", True):
current_ts_in_millis = int(round(time.time() * 1000))
if current_ts_in_millis > item["ts"]:
break
Expand Down