mirror/thingsboard-gateway
1
0
Fork 0
mirror of https://github.com/thingsboard/thingsboard-gateway synced 2025-10-26 22:31:42 +08:00
Code Issues Releases Wiki Activity

Improvements for RPC to the gateway. Added functions:

Browse Source 
gateway_devices - returns object with keys - device names and values - connector names
gateway_stats - returns information about count of the processed messages of 5 last seconds
This commit is contained in:
zbeacon
2020-03-02 15:06:03 +02:00
parent 0a6d2a6a29
commit 7836063952
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
thingsboard_gateway/gateway/tb_gateway_service.py
View File

@@ -76,6 +76,8 @@ class TBGatewayService:
}
self.__gateway_rpc_methods = {
"ping": self.__rpc_ping,
"stats": self.__form_statistics,
"devices": self.__rpc_devices,
}
self.__sheduled_rpc_calls = []
self.__self_rpc_sheduled_methods_functions = {
@@ -108,17 +110,16 @@ class TBGatewayService:
cur_time = time.time()*1000
if self.__sheduled_rpc_calls:
for rpc_call_index in range(len(self.__sheduled_rpc_calls)):
rpc_call = self.__sheduled_rpc_calls.pop(rpc_call_index)
if rpc_call != 'del' and cur_time > rpc_call[0]:
rpc_call = self.__sheduled_rpc_calls[rpc_call_index]
if cur_time > rpc_call[0]:
rpc_call = self.__sheduled_rpc_calls.pop(rpc_call_index)
result = None
try:
result = rpc_call[1]["function"](*rpc_call[1]["arguments"])
except Exception as e:
log.exception(e)
log.info(result)
else:
del rpc_call
rpc_call = "del"
if result == 256:
log.warning("Error on RPC command: 256. Permission denied.")
if self.__rpc_requests_in_progress and self.tb_client.is_connected():
for rpc_in_progress, data in self.__rpc_requests_in_progress.items():
if cur_time >= data[1]:
@@ -446,6 +447,13 @@ class TBGatewayService:
def __rpc_ping(self, *args):
return {"code": 200, "resp": "pong"}
def __rpc_devices(self, *args):
data_to_send = {}
for device in self.__connected_devices:
if self.__connected_devices[device]["connector"] is not None:
data_to_send[device] = self.__connected_devices[device]["connector"].get_name()
return {"code": 200, "resp": data_to_send}
def rpc_with_reply_processing(self, topic, content):
req_id = self.__rpc_requests_in_progress[topic][0]["data"]["id"]
device = self.__rpc_requests_in_progress[topic][0]["device"]