chore: 修复打包镜像

Makefile

@@ -19,12 +19,12 @@ clean:
 	@echo 'Done [clean]'
 
 
-image_name := ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/isc_video_record/${NAME}
+image_name := ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/ils_common_video/${ENVFORWORK}-${WORKNAME}
 image_version = $(shell cat setup.py| grep -Po "version='\K(\d+\.\d+\.\d+-?\w*)")
 docker_name = $(image_name):$(image_version)
 
 build: clean
-	@sudo docker build --build-arg WORKNAME=${NAME} -t $(docker_name) .
+	@sudo docker build --build-arg ENVFORWORK=${ENVFORWORK} --build-arg WORKNAME=${WORKNAME} -t $(docker_name) .
 	@sudo docker push $(docker_name)
 	@sudo docker rmi $(docker_name)
 	@echo 'Build successful! [$(docker_name)]'

dockers/eviz/recorder.conf

+[supervisord]
+nodaemon=true
+
+[program:eviz-merger]
+command=ils_common_video -e eviz -w merger -l /var/log/ils-common-video
+directory=/root/ils-common-video
+user=root
+stopasgroup=true
+killasgroup=true
+autostart=true
+autorestart=true
+
+[program:eviz-recorder]
+command=ils_common_video -e eviz -w recorder -d -l /var/log/ils-common-video
+directory=/root/ils-common-video
+user=root
+stopasgroup=true
+killasgroup=true
+autostart=true
+autorestart=true

dockers/merger.conf → dockers/isc/merger.conf

 [supervisord]
 nodaemon=true
 
-[program:merger]
-command=isc_video_record merger -l /var/log/event_vss
-directory=/root/isc-video-record
+[program:isc-merger]
+command=ils_common_video -e isc -w merger -l /var/log/ils-common-video
+directory=/root/ils-common-video
 user=root
 stopasgroup=true
 killasgroup=true
 autostart=true
 autorestart=true
 
-[program:tasks]
-command=isc_video_record tasks -d -l /var/log/event_vss
-directory=/root/isc-video-record
+[program:isc-tasks]
+command=ils_common_video -e isc -w tasks -d -l /var/log/ils-common-video
+directory=/root/ils-common-video
 user=root
 stopasgroup=true
 killasgroup=true

dockers/recorder.conf → dockers/isc/recorder.conf

 [supervisord]
 nodaemon=true
 
-[program:merger]
-command=isc_video_record recorder -l /var/log/event_vss
-directory=/root/isc-video-record
+[program:isc-recorder]
+command=ils_common_video -e isc -w recorder -l /var/log/ils-common-video
+directory=/root/ils-common-video
 user=root
 stopasgroup=true
 killasgroup=true

ils_common_video/isc_video/recorder.py

@@ -96,7 +96,7 @@ class StreamRecorder:
             on_message, args=(self.connection, threads))
 
         # 设置消费能力
-        self.channel.basic_qos(prefetch_count=dynaconf.settings.get('PREFETCH_COUNT', 300))
+        self.channel.basic_qos(prefetch_count=dynaconf.settings.get('PREFETCH_COUNT', 150))
         self.channel.basic_consume(on_message_callback=on_message_callback,
                                    queue=self.queue_name)
 
@@ -169,7 +169,7 @@ class ProcessMessage:
         elements = [
             prefix, camera_code,
             start_time.strftime('%Y%m%dT%H%M%S'),
-            end_time.strftime('%Y%m%d%H%M%S')
+            end_time.strftime('%Y%m%dT%H%M%S')
         ]
         if part_num is not None:
             elements.append(str(part_num))
@@ -387,6 +387,7 @@ class ProcessMessage:
         _, error_log = record_thread(stream_url, file_name, thread_name=body['camera_code'])
         video_info, video_error_log = judge_video_error(file_name)
         if video_error_log:
+            log.warning('file: %s, error_log: %s', file_name, video_error_log)
             video_duration = time_to_seconds(video_info['duration'])
             if video_duration > 5:
                 tmp_file_name = file_name + '.tmp.mp4'
@@ -397,9 +398,6 @@ class ProcessMessage:
             else:
                 # 小于5秒不要了
                 os.remove(file_name)
-
-            send_alarm_to_developer('recorder', 'file_name: {}, error_log: {}'.format(file_name, video_error_log),
-                                    mobiles=['15131601294'])
         return video_info, error_log
 
     @staticmethod

ils_common_video/main.py

@@ -6,7 +6,10 @@ def get_parser():
     parsers = argparse.ArgumentParser(
         description='ISC motion detection playback video stream recording service.'
     )
-    parsers.add_argument('worker', choices=['merger', 'recorder', 'tasks'], type=str)
+    parsers.add_argument('-e', '--env', choices=['isc', 'eviz', 'common'], type=str,
+                         dest='env', help='choices [isc, eviz]')
+    parsers.add_argument('-w', '--worker', type=str,
+                         dest='worker')
 
     parsers.add_argument('-d', '--debug', required=False, help='Enable debug output',
                          dest='debug', action='store_true', default=False)
@@ -21,9 +24,10 @@ def command_line_runner():
     parser = get_parser()
     args = vars(parser.parse_args())
 
-    log_init(args['worker'], debug=args['debug'], log_path=args['log_path'], backupCount=3,
-             thread=True)
+    log_init(args['worker'], debug=args['debug'], log_path=args['log_path'],
+             backupCount=3, thread=True)
 
+    if args['env'] == 'isc':
         if args['worker'] == 'merger':
             from ils_common_video.isc_video.merger import EventMergerJob
             em = EventMergerJob()
@@ -37,6 +41,13 @@ def command_line_runner():
             from ils_common_video.isc_video.tasks import Tasks
             t = Tasks()
             t.start()
+    elif args['env'] == 'eviz':
+        if args['worker'] == 'recorder':
+            from ils_common_video.eviz_video.recorder import runner
+            runner()
+        elif args['worker'] == 'merger':
+            from ils_common_video.eviz_video.merger import main as record_main
+            record_main()
     else:
         parser.print_help()
 

setup.py

@@ -19,12 +19,13 @@ requires = [
     'oss2',
     'apscheduler',
     'openpyxl',
-    'pandas'
+    'pandas',
+    'opencv-python'
 ]
 
 setuptools.setup(
     name='ils-common-video',
-    version='1.0.0b17',
+    version='2.0.0',
     description='ISC motion detection playback video stream recording service.',
     long_description=long_description,
     long_description_content_type='text/markdown',