提交 1bb03abb authored 作者: blu's avatar blu

mqtt login configuration via env variables support

上级 56997993
...@@ -59,6 +59,9 @@ SHARENAME = os.getenv('SHARE', 'pre-data') ...@@ -59,6 +59,9 @@ SHARENAME = os.getenv('SHARE', 'pre-data')
MQTT_HOST = os.getenv('MQTT_HOST', 'evcloud.ilabservice.cloud') MQTT_HOST = os.getenv('MQTT_HOST', 'evcloud.ilabservice.cloud')
MQTT_PORT = int(os.getenv('MQTT_PORT', 1883)) MQTT_PORT = int(os.getenv('MQTT_PORT', 1883))
MQTT_CID = os.getenv('MQTT_CID', None)
MQTT_USER=os.getenv('MQTT_USER', None)
MQTT_PASSWORD=os.getenv('MQTT_PASSWORD', None)
REDIS_ADDR = os.getenv('REDIS', 'redis://localhost:6379') REDIS_ADDR = os.getenv('REDIS', 'redis://localhost:6379')
workd = os.getenv('BIN_DIR', '../') workd = os.getenv('BIN_DIR', '../')
binName = os.getenv('BIN_NAME', 'detector ') binName = os.getenv('BIN_NAME', 'detector ')
...@@ -162,7 +165,9 @@ class VAMMQTTClient: ...@@ -162,7 +165,9 @@ class VAMMQTTClient:
Parameters Parameters
''' '''
self.client = mqtt.Client( self.client = mqtt.Client(
"vamqtt", userdata=callback) # , protocol=mqtt.MQTTv5) MQTT_CID if MQTT_CID else "vamqtt", userdata=callback) # , protocol=mqtt.MQTTv5)
if MQTT_USER and MQTT_PASSWORD:
self.client.username_pw_set(username=MQTT_USER,password=MQTT_PASSWORD)
self.client.on_connect = VAMMQTTClient.on_connect self.client.on_connect = VAMMQTTClient.on_connect
self.client.on_message = VAMMQTTClient.on_message self.client.on_message = VAMMQTTClient.on_message
self.client.connect_async(host, port, 30) self.client.connect_async(host, port, 30)
...@@ -305,7 +310,9 @@ def video_analysis(data): ...@@ -305,7 +310,9 @@ def video_analysis(data):
if ret['data']['humanDetect']['found'] != 0: if ret['data']['humanDetect']['found'] != 0:
uploadFile(ipcSN, dirName, imageName, downloadDir) uploadFile(ipcSN, dirName, imageName, downloadDir)
# pub msg # pub msg
mc = mqtt.Client("vamqtt-pub") mc = mqtt.Client((MQTT_CID + '-pub') if MQTT_CID else "vamqtt-pub")
if MQTT_USER and MQTT_PASSWORD:
mc.username_pw_set(username=MQTT_USER,password=MQTT_PASSWORD)
mc.connect(MQTT_HOST, MQTT_PORT) mc.connect(MQTT_HOST, MQTT_PORT)
mc.publish('video.ai/v1.0/result', json.dumps(ret), qos=1) mc.publish('video.ai/v1.0/result', json.dumps(ret), qos=1)
try: try:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论