Merge branch 'develop'

ils_common_video/db/rabbitmq.py

@@ -7,7 +7,7 @@ from retrying import retry
 def rabbitmq_connect():
     config = dynaconf.settings.get('RABBITMQ', {})
     amqp_config = dict(user=config.get('USER'), password=config.get('PASSWORD'), host=config.get('HOST'),
-                       port=config.get('PORT'))
+                       port=config.get('PORT'), heartbeat=0)
     if not amqp_config:
         raise ConnectionError('rabbitmq配置错误')
     connection = pika.BlockingConnection(

ils_common_video/isc_video/recorder.py

@@ -18,7 +18,7 @@ from ils_common_video.utils.api_helper import IntelabApiHelper, PlaybackUrlExcep
 from ils_common_video.utils.isc_client import HikVisionClient
 from ils_common_video.utils import aliyun_oss
 from ils_common_video.utils.record_utils import record_thread, get_video_duration, time_to_seconds, judge_video_error
-from ils_common_video.utils.alarm_utils import send_alarm_to_developer
+from ils_common_video.utils.alarm_utils import send_alarm_to_developer, send_markdown
 from ils_common_video.db import mysql
 from ils_common_video.utils.video_file import VideoFile
 
@@ -73,7 +73,7 @@ class StreamRecorder:
 
             except Exception as e:
                 log.exception(e)
-                send_alarm_to_developer('recorder_{}'.format(dynaconf.settings.get('SERVICE_NAME',0)), e)
+                send_alarm_to_developer('recorder_{}'.format(dynaconf.settings.get('SERVICE_NAME', 0)), e)
 
             finally:
                 try:
@@ -317,11 +317,18 @@ class ProcessMessage:
             'network_quality_grade': video_file.network_quality_grade,
         }
         queue_name = 'UNVERIFIED_EVENT_QUEUE'
+        try:
             connection = rabbitmq_connect()
             channel = connection.channel()
             channel.queue_declare(queue_name, durable=True)
             # 发送mq信息
-        channel.basic_publish(exchange='', routing_key=queue_name,body=json.dumps(video_data, ensure_ascii=False))
+            channel.basic_publish(exchange='', routing_key=queue_name, body=json.dumps(video_data, ensure_ascii=False))
+        except:
+            log.error("send filter error,content is: %s", json.dumps(video_data, ensure_ascii=False))
+            send_markdown('rabbitmq连接异常',
+                          'recorder_{}:rabbitmq连接异常\n{}'.format(dynaconf.settings.get('SERVICE_NAME', 0),
+                                                                json.dumps(video_data, ensure_ascii=False)))
+        finally:
             connection.close()
 
     @staticmethod
@@ -400,7 +407,7 @@ class ProcessMessage:
         except Exception as e:
             log.exception(e)
             res.update({'except': True, 'remark': e.__str__()})
-            send_alarm_to_developer('recorder-{}'.format(threading.get_ident()), e)
+            send_alarm_to_developer('recorder_{}'.format(dynaconf.settings.get('SERVICE_NAME', 0)), e)
 
         log.info('%s: playback: %s', body['camera_code'], playback_stream)
         is_completed, recovered_time, retry_info = False, start_time, {}