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

Revert "Fixes for PR #880"

Browse Source 
This reverts commit cdc532d9cf.
This commit is contained in:
samson0v
2022-07-15 14:47:51 +03:00
parent 4ad52750b1
commit 53628473e1
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
thingsboard_gateway/gateway/tb_client.py
View File

@@ -22,7 +22,7 @@ from thingsboard_gateway.tb_utility.tb_utility import TBUtility
log = logging.getLogger("tb_connection")
CHECK_CERT_PERIOD = 86400
CHECK_CERT_PERIOD = 24
CERTIFICATE_DAYS_LEFT = 3
@@ -86,20 +86,20 @@ class TBClient(threading.Thread):
if time() - self._last_cert_check_time >= CHECK_CERT_PERIOD:
if self.__cert:
log.info('Will generate new certificate')
new_cert = TBUtility.check_certificate(self.__cert, key=self.__private_key,
days_left=CERTIFICATE_DAYS_LEFT)
new_cert, new_key = TBUtility.check_certificate(self.__cert, days_left=CERTIFICATE_DAYS_LEFT)
if new_cert:
self.client.send_attributes({'newCertificate': new_cert})
self.client.send_attributes({'newCertificate': new_cert, 'newKey': new_key})
if self.__ca_cert:
is_outdated = TBUtility.check_certificate(self.__ca_cert, generate_new=False,
days_left=CERTIFICATE_DAYS_LEFT)
log.info('Will generate bew CA')
new_ca_cert, new_ca_key = TBUtility.check_certificate(self.__ca_cert,
days_left=CERTIFICATE_DAYS_LEFT)
if is_outdated:
self.client.send_attributes({'CACertificate': 'CA certificate will outdated soon'})
if new_ca_cert:
self.client.send_attributes({'newCACertificate': new_ca_cert, 'newCAKey': new_ca_key})
sleep(10)
sleep(.2)
def pause(self):
self.__paused = True