提交 8a4eef48 authored 作者: zw.wang's avatar zw.wang

fix: [recorder] 修复下载文件不存在时异常

上级 7e754e53
...@@ -95,7 +95,7 @@ class StreamRecorder: ...@@ -95,7 +95,7 @@ class StreamRecorder:
on_message, args=(self.connection, threads)) on_message, args=(self.connection, threads))
# 设置消费能力 # 设置消费能力
self.channel.basic_qos(prefetch_count=dynaconf.settings.get('PREFETCH_COUNT', 50)) self.channel.basic_qos(prefetch_count=dynaconf.settings.get('PREFETCH_COUNT', 80))
self.channel.basic_consume(on_message_callback=on_message_callback, self.channel.basic_consume(on_message_callback=on_message_callback,
queue=self.queue_name) queue=self.queue_name)
...@@ -178,6 +178,7 @@ class ProcessMessage: ...@@ -178,6 +178,7 @@ class ProcessMessage:
aliyun_oss.oss_download_file(event['video_url'], part_file_name) aliyun_oss.oss_download_file(event['video_url'], part_file_name)
if os.path.isfile(part_file_name): if os.path.isfile(part_file_name):
part_files_set.add(part_file_name) part_files_set.add(part_file_name)
else:
raise FileExistsError(part_file_name) raise FileExistsError(part_file_name)
except Exception as e: except Exception as e:
log.exception(e) log.exception(e)
......
...@@ -62,6 +62,19 @@ class IntelabApiHelper: ...@@ -62,6 +62,19 @@ class IntelabApiHelper:
for pre_event in pre_events: for pre_event in pre_events:
# 合并时间间隔较短的事件 # 合并时间间隔较短的事件
# TODO online=0的处理
'''
{
"deviceType": null,
"regionIndexCode": "bb488f00-486e-4f6d-afde-24e22a13c427",
"collectTime": "2021-06-19T18:32:27.000+08:00",
"deviceIndexCode": null, "ip": null, "regionName": "\u9e7f\u57ce\u533a",
"indexCode": "7a22574c7dae4f869b1f3dca55587175",
"cn": "\u9e7f\u57ce\u533a\u5434\u7acb\u695a\u53e3\u8154\u706d\u83cc\u95f4",
"treatyType": "1", "manufacturer": null, "port": null,
"online": 0
}
'''
if 'beginTime' not in pre_event: if 'beginTime' not in pre_event:
log.exception(ValueError(json.dumps(pre_event))) log.exception(ValueError(json.dumps(pre_event)))
continue continue
......
...@@ -24,7 +24,7 @@ requires = [ ...@@ -24,7 +24,7 @@ requires = [
setuptools.setup( setuptools.setup(
name='isc-video-record', name='isc-video-record',
version='1.0.0b5', version='1.0.0b6',
description='ISC motion detection playback video stream recording service.', description='ISC motion detection playback video stream recording service.',
long_description=long_description, long_description=long_description,
long_description_content_type='text/markdown', long_description_content_type='text/markdown',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论