chore: [recorder] 修改线程日志

isc_video_record/recorder.py

@@ -66,7 +66,7 @@ class StreamRecorder:
                     ack = process_message.process()
 
                 else:
-                    log.info('camera_code[%s] processing, end.', thread_id, body['camera_code'])
+                    log.info('camera_code[%s] processing, end.', body['camera_code'])
 
             except Exception as e:
                 log.exception(e)
@@ -152,7 +152,7 @@ class ProcessMessage:
             if _continue:
                 # 续约成功，本次任务继续
                 # 判定当前分布式锁是本线程设置的
-                log.info('%s:%s,ttl:%s', self.camera_key, pipe.ttl(self.camera_key))
+                log.info('%s,ttl:%s', self.camera_key, pipe.ttl(self.camera_key))
                 mysql.update_video_info(self.body['db_table'], event['video_id'], status=0)
                 self.recording(event)
             else:
@@ -237,7 +237,7 @@ class ProcessMessage:
             log.info('%s: %s is completed.', event['camera_code'], record_result['file_name'])
             status = 1
         else:
-            next_retry_time = now + timedelta(minutes=30)
+            next_retry_time = now + timedelta(minutes=10)
             retry_count += 1
             if (next_retry_time - event['start_time']) > timedelta(days=3):
                 # 重试最长时间为3天
@@ -287,6 +287,7 @@ class ProcessMessage:
         except Exception as e:
             log.exception(e)
             res.update({'except': True, 'remark': e.__str__()})
+            send_alarm_to_developer('recorder-{}'.format(self.thread_id), e)
 
         log.info('%s: playback: %s', self.body['camera_code'], playback_urls)
         if playback_urls:
@@ -313,8 +314,8 @@ class ProcessMessage:
 
             file_duration = time_to_seconds(file_info['duration'])
             if not os.path.isfile(file_info['file_name']):
+                retry_count = 4
                 log.info('当前录制无文件输出:%s, 重试计数: %s', self.body['camera_code'], retry_count)
-                time.sleep(5)
             elif file_duration < complete_duration - 2:
                 # 视频文件时长小于完整时长
                 new_start_time = start_time + timedelta(seconds=file_duration)
@@ -343,7 +344,8 @@ class ProcessMessage:
             concat(part_files, file_name, removed=True)
         elif len(part_files) == 1:
             shutil.move(part_files[0], file_name)
-        log.info('%s: The download is complete, file %s', self.body['camera_code'], file_name)
+        log.info('%s: The download is complete, file %s, is_completed: %s',
+                 self.body['camera_code'], file_name, is_completed)
         res.update({
             'file_name': file_name,
             'is_completed': is_completed,

isc_video_record/utils/isc_client.py

@@ -128,7 +128,8 @@ class HikVisionClient(object):
             'endTime': end_time,
             'recordLocation': 1,
             'protocol': protocol,
-            'expand': 'transcode=1&fileSize=1024&videotype=h264',
+            'expand': 'fileSize=1024',
+            # 'expand': 'transcode=1&fileSize=1024&videotype=h264',
             'streamform': streamform,
         }
         log.info('requests body: {}'.format(body))

isc_video_record/utils/pre_event.py

@@ -24,6 +24,7 @@ class PreEvent(object):
             where
                 $start_time <= time and time < $end_time
                 and camera_index = $camera_index
+                and event_type = '131331'
             order by time
         '''
         res = influxdb.query(sql, bind_params={

setup.py

@@ -24,7 +24,7 @@ requires = [
 
 setuptools.setup(
     name='isc-video-record',
-    version='1.0.0b11',
+    version='1.0.0b12',
     description='ISC motion detection playback video stream recording service.',
     long_description=long_description,
     long_description_content_type='text/markdown',

tests/test_playback.py

@@ -23,10 +23,10 @@ client = HikVisionClient(config.get('KEY'), config.get('SECRET'),
 
 def main():
 
-    start_time = datetime(2021, 6, 30, 18, 58, 29).astimezone(tz)
+    start_time = datetime(2021, 7, 1, 15, 58, 29).astimezone(tz)
     # start_time = datetime(2021, 5, 28, 9, 10, 59).astimezone(tz)
-    end_time = datetime(2021, 6, 30, 18, 59, 0).astimezone(tz)
-    camera_index = 'be03d4d8b12344a9adc92bfbf11fef53'
+    end_time = datetime(2021, 7, 1, 15, 59, 0).astimezone(tz)
+    camera_index = '5c8d0e1d572a4904a2c753ec24dfdf41'
 
     results = []
     try:
@@ -53,7 +53,7 @@ def main():
                 else:
                     print(res)
 
-    for event in res:
+    for event in results:
         cur_start_time = max(event['start_time'], start_time)
         cur_end_time = min(event['end_time'], end_time)
         print(cur_start_time, cur_end_time)