removed schedule library from gateway process in myems-bacnet service

pull/41/head
13621160019@163.com 2021-04-30 12:27:38 +08:00
parent 050304256f
commit 6f92e88ece
2 changed files with 65 additions and 77 deletions

View File

@ -10,8 +10,6 @@ bacpypes
mysql.connector
Schedule
## Installation
Download and install MySQL Connector:
@ -38,14 +36,6 @@ Download and install bacpypes library
$ sudo ufw allow 47808
```
Download and install Schedule
```
$ cd ~/tools
$ git clone https://github.com/dbader/schedule.git
$ cd ~/tools/schedule
$ sudo python3 setup.py install
```
Install myems-bacnet service
```
$ cd ~

View File

@ -12,22 +12,27 @@ import schedule
########################################################################################################################
def job(logger, ):
def process(logger, ):
cnx_system_db = None
cursor_system_db = None
while True:
# the outermost while loop
################################################################################################################
# Step 1: Verify Gateway Token
################################################################################################################
cnx_system_db = None
cursor_system_db = None
while not cnx_system_db or not cnx_system_db.is_connected():
try:
cnx_system_db = mysql.connector.connect(**config.myems_system_db)
cursor_system_db = cnx_system_db.cursor()
except Exception as e:
logger.error("Error in step 1.1 of Gateway process " + str(e))
logger.error("Error to connect to myems_system_db in step 1.1 of gateway process " + str(e))
if cursor_system_db:
cursor_system_db.close()
if cnx_system_db:
cnx_system_db.close()
return
print("Failed to connect to myems_system_db, sleep a minute and retry...")
time.sleep(60)
continue
# TODO: choose a more secure method to verify gateway token
try:
@ -42,16 +47,13 @@ def job(logger, ):
cursor_system_db.close()
if cnx_system_db:
cnx_system_db.close()
return
time.sleep(60)
continue
if row is None:
logger.error("Error in step 1.3 of gateway process: Not Found ")
if cursor_system_db:
cursor_system_db.close()
if cnx_system_db:
cnx_system_db.close()
return
logger.error("Error in step 1.3 of gateway process: Gateway Not Found ")
time.sleep(60)
continue
############################################################################################################
# Step 2: Collect Gateway Information
############################################################################################################
@ -68,18 +70,14 @@ def job(logger, ):
cursor_system_db.execute(update_row, (config.gateway['id'], ))
cnx_system_db.commit()
except Exception as e:
logger.error("Error in step 3.1 of gateway process " + str(e))
return
finally:
logger.error("Error in step 3.2 of gateway process " + str(e))
if cursor_system_db:
cursor_system_db.close()
if cnx_system_db:
cnx_system_db.close()
def process(logger, ):
schedule.every(1).minutes.do(job, logger,)
while True:
schedule.run_pending()
time.sleep(60)
continue
# sleep some seconds
time.sleep(60)
# end of the outermost while loop