运行中日志为空报错修复

app/routers/jm_job_log.py

@@ -86,12 +86,12 @@ def get_job_all_task(run_id: str, db: Session = Depends(get_db)):
                     'task_id': task_id,
                 }
                 task_log_res = get_task_log(af_job.id, af_job_run.af_run_id, task_id)
-                task_log = task_log_res['data'] if 'data' in task_log_res else None
+                task_log = task_log_res['data'] if 'data' in task_log_res.keys() else None
                 if task_log:
                     log.update({
-                        'execute_result': RUN_STATUS[task_log['status']] if 'status' in task_log else None,
-                        'execute_time':task_log['start_time'] if 'start_time' in task_log else None,
-                        'log': task_log['log'] if 'log' in task_log else None
+                        'execute_result': RUN_STATUS[task_log['status']] if 'status' in task_log.keys() and task_log['status'] else None,
+                        'execute_time':task_log['start_time'] if 'start_time' in task_log.keys() else None,
+                        'log': task_log['log'] if 'log' in task_log.keys() else None
                         })
                 res.append(log)
         else:
@@ -102,12 +102,12 @@ def get_job_all_task(run_id: str, db: Session = Depends(get_db)):
                 'task_id':task['id'],
             }
             task_log_res = get_task_log(af_job.id, af_job_run.af_run_id, task['id'])
-            task_log = task_log_res['data'] if 'data' in task_log_res else None
+            task_log = task_log_res['data'] if 'data' in task_log_res.keys() else None
             if task_log:
                 log.update({
-                    'execute_result':RUN_STATUS[task_log['status']] if 'status' in task_log else None,
-                    'execute_time':task_log['start_time'] if 'start_time' in task_log else None,
-                    'log': task_log['log'] if 'log' in task_log else None
+                    'execute_result':RUN_STATUS[task_log['status']] if 'status' in task_log.keys() and task_log['status'] else None,
+                    'execute_time':task_log['start_time'] if 'start_time' in task_log.keys() else None,
+                    'log': task_log['log'] if 'log' in task_log.keys() else None
                     })
             res.append(log)
     return res

app/routers/job_log.py

@@ -47,7 +47,7 @@ def get_job_logs(job_id: Optional[int] = None, params: Params=Depends(get_page),
         af_job = crud.get_airflow_job_once(db, af_job_run.job_id)
         task = list(af_job.tasks)[0] if len(list(af_job.tasks))>0 else None
         log_res = get_task_log(af_job.id, af_job_run.af_run_id, task['id'])
-        job_log = log_res['data'] if 'data' in log_res else None
+        job_log = log_res['data'] if 'data' in log_res.keys() else None
         log = {
             "id": af_job_run.id,
             "job_id": job_id,
@@ -55,8 +55,8 @@ def get_job_logs(job_id: Optional[int] = None, params: Params=Depends(get_page),
             "af_job_id": int(af_job_run.job_id),
             "run_id": af_job_run.id,
             "af_run_id": af_job_run.af_run_id,
-            "start_time": job_log['start_time'] if 'start_time' in job_log else None,
-            "result": RUN_STATUS[job_log['status']] if 'status' in job_log else None,
+            "start_time": job_log['start_time'] if 'start_time' in job_log.keys() else None,
+            "result": RUN_STATUS[job_log['status']] if 'status' in job_log.keys()and job_log['status'] else None,
         }
         res.append(log)
     return page_help(res,params['page'],params['size'],total)
@@ -73,9 +73,9 @@ def get_job_logs_once(run_id: int, db: Session = Depends(get_db)):
     # 取出其中的task
     task = list(af_job.tasks)[0] if len(list(af_job.tasks))>0 else None
     log_res = get_task_log(af_job.id, af_job_run.af_run_id, task['id'])
-    job_log = log_res['data'] if 'data' in log_res else None
+    job_log = log_res['data'] if 'data' in log_res.keys() else None
     log = {
-        "log": job_log['log'] if 'log' in log_res else None
+        "log": job_log['log'] if 'log' in log_res.keys() else None
     }
     return log
 

app/utils/send_util.py

@@ -107,7 +107,6 @@ def data_transfer_run(source_tb: str, target_tb: str):
 
 # 获取task日志
 def get_task_log(job_id: str, af_run_id: str, task_id: str):
-    print('job_id==',job_id, 'af_run_id==',af_run_id, 'task_id==',task_id)
     res = requests.get(url=f'http://{HOST}:{PORT}/af/af_run/task_log/{job_id}/{af_run_id}/{task_id}')
     result = res.json()
     if 'code' in result.keys() and result['code'] == 200: