commit

src/python2/pjisuv/callback-nohup.sh

@@ -5,4 +5,4 @@ if [ ! -d "./log" ]; then
 else
     echo "Directory './log' already exists."
 fi
-nohup python2 callback-pjisuv.py > log/callback.out 2>&1 &
+nohup python2 callback-pjisuv.py > log/callback-pjisuv.out 2>&1 &

src/python2/pjisuv/callback-pjisuv.py

@@ -92,18 +92,17 @@ if __name__ == '__main__':
                     "secretKey": json_object['secretKey']
                 }
                 json_data1 = json.dumps(data1)
-                logging.info("授权接口请求中： %s" % url1_private)
+                # logging.info("授权接口请求中： %s" % url1_private)
                 request1 = urllib2.Request(url1_private, json_data1,
                                            headers={'Content-Type': 'application/json'})
                 response1 = urllib2.urlopen(request1)
                 result_json1 = response1.read()
                 result_object1 = json.loads(result_json1)
-                logging.info("授权接口请求结果为： %s", result_object1)
+                # logging.info("授权接口请求结果为： %s", result_object1)
                 try:
                     access_token = result_object1.get('data').get('accessToken')
                     logging.info("bag文件为：%s" % str(json_object['rosBagPath']))
                     old_date = json_object['dataName']
-                    data_size = bucket.get_object_meta(json_object['rosBagPath']).content_length
                     equipment_no = json_object['equipmentNo']
                     old_file_path = json_object['filePath']
                     old_ros_bag_path = json_object['rosBagPath']
@@ -115,12 +114,15 @@ if __name__ == '__main__':
 
                 upload = False
                 if old_date is None:
+                    logging.info("手动上传的数据")
                     upload = True
                     old_date = ''
                 elif str(old_date).endswith('.bag'):
+                    logging.info("手动上传的数据")
                     upload = True
                     pass
                 else:
+                    logging.info("自动采集的数据")
                     upload = False
 
                 old_delete_list = []
@@ -153,11 +155,11 @@ if __name__ == '__main__':
                     bucket.batch_delete_objects(old_delete_list)
 
                 if 'userId' in json_object:
-                    logging.info("json_object 包含 'userId' 字段，值为:", json_object['userId'])
+                    logging.info("json_object 包含 'userId' 字段，是手动上传的包，userId为:", json_object['userId'])
                     data2 = {
                         'userId': json_object['userId'],
                         "dataName": new_date,
-                        "dataSize": data_size,
+                        "dataSize": json_object['dataSize'],
                         "equipmentNo": equipment_no,
                         "filePath": old_file_path.replace(old_date, new_date),
                         "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
@@ -165,10 +167,10 @@ if __name__ == '__main__':
                         "triggerId": trigger_id
                     }
                 else:
-                    logging.info("json_object 不包含 'userId' 字段")
+                    logging.info("json_object 不包含 'userId' 字段，是自动采集的包")
                     data2 = {
                         "dataName": new_date,
-                        "dataSize": data_size,
+                        "dataSize": bucket.get_object_meta(json_object['rosBagPath']).content_length,
                         "equipmentNo": equipment_no,
                         "filePath": old_file_path.replace(old_date, new_date),
                         "rosBagPath": old_ros_bag_path.replace(old_date, new_date),

src/python2/pjisuv/simulation-tail.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-tail -f log/simulation.log