commit

src/python2/pjibot_delivery/csv-.py

@@ -10,11 +10,12 @@ import logging
 
 path1 = '/mnt/disk001/dcl_data_process/src/python2/pjibot_delivery/'
 path2 = '/mnt/disk001/dcl_data_process/src/python2/pjibot_delivery/resource/run/'
+path3 = '/mnt/disk001/dcl_data_process/src/python2/pjibot_delivery/csv/'
 logging.basicConfig(filename=path1 + 'log/csv.log', level=logging.INFO,
                     format='%(asctime)s - %(levelname)s - %(message)s')
 
 key1 = 'pjibot_delivery/'
-sleep_time = 60  # 每多少秒扫描一次
+sleep_time = 30  # 每多少秒扫描一次
 
 
 def parse_csv(data_bag, parse_prefix, local_parse_dir, local_delete_list):
@@ -83,7 +84,6 @@ if __name__ == '__main__':
     bucket = oss2.Bucket(auth, endpoint, 'pji-bucket1')
     while True:
         logging.info("开始新一轮扫描")
-        time.sleep(sleep_time)
         try:
             local_delete_list = []
             oss_delete_list = []
@@ -123,7 +123,7 @@ if __name__ == '__main__':
                         continue
 
                     logging.info("开始生成场景还原csv: %s" % str(obj1.key))
-                    local_merged_bag_path = path1 + 'camera/' + merged_bag_object_key
+                    local_merged_bag_path = path3 + merged_bag_object_key
                     local_merged_dir = '/'.join(local_merged_bag_path.split('/')[:-1])
                     local_parse_dir = local_merged_dir.replace('data_merge', 'data_parse')
                     if not os.path.exists(local_merged_dir):
@@ -150,3 +150,4 @@ if __name__ == '__main__':
                         logging.exception("捕获到一个异常: %s" % str(e))
         except Exception as e:
             logging.exception("全局错误处理: %s" % str(e))
+        time.sleep(sleep_time)