fix: bug

hikvision_isc_client/event_merger.py

@@ -63,7 +63,8 @@ class EventMergerJob:
                 if now_std - last_check_time > timedelta(days=1):
                     last_check_time = now_std - timedelta(days=1)
 
-            res = pipe.set(last_check_time_key, now_std.strftime('%Y-%m-%d %H:%M:%S'))
+            res = pipe.set(last_check_time_key,
+                           now_std.astimezone(pytz.utc).strftime('%Y-%m-%d %H:%M:%S'))
             if not res:
                 continue
 

hikvision_isc_client/recorder.py

@@ -27,7 +27,6 @@ client = HikVisionClient(config.get('KEY'), config.get('SECRET'),
 class StreamRecorder:
 
     def __init__(self):
-        log_init(__name__, False, './log')
         self.queue_name = 'ISC_RECORD_JOB'
         self.connection = rabbitmq_connect()
 
@@ -87,12 +86,14 @@ class StreamRecorder:
         self.connection.close()
 
     def process_message(self, body):
-        filename = self.recorder(
+        file_name = self.recorder(
             body['camera_index'],
             datetime.strptime(body['start_time'], '%Y-%m-%dT%H:%M:%S'),
             datetime.strptime(body['end_time'], '%Y-%m-%dT%H:%M:%S'))
-        video_info = get_video_duration(filename)
-        url = aliyun_oss.oss_upload_file('isc_record/' + filename.split('/')[-1], filename)
+        video_info = get_video_duration(file_name)
+        url = ''
+        if file_name and os.path.isfile(file_name):
+            url = aliyun_oss.oss_upload_file('isc_record/' + file_name.split('/')[-1], file_name)
         log.info('video_info: %s, url: %s', video_info, url)
         return True
 
@@ -166,5 +167,6 @@ class StreamRecorder:
 
 
 if __name__ == '__main__':
+    log_init(__name__, False, '/var/log/event_rcv')
     stream_recorder = StreamRecorder()
     stream_recorder.start()

setup.py

@@ -31,6 +31,7 @@ setuptools.setup(
         'redis',
         'mysql-connector',
         'retrying',
+        'oss2'
     ],
     python_requires='>=3.6',
 )