From 1e823aef97534e91edc088bc94f4f0f9ebc6f1b4 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 11 Sep 2020 17:08:40 +0800
Subject: [PATCH] FIX ci log data with null bug

---
 app/controllers/ci/builds_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/ci/builds_controller.rb b/app/controllers/ci/builds_controller.rb
index 90b78d3ea..7df443665 100644
--- a/app/controllers/ci/builds_controller.rb
+++ b/app/controllers/ci/builds_controller.rb
@@ -44,7 +44,7 @@ class Ci::BuildsController < Ci::BaseController
 
     log = step.log
 
-    result = log.blank? ? nil : JSON.parse(log.log_data)
+    result = log.blank? ? nil : (log.log_data[0..5].include?('null') ? nil : JSON.parse(log.log_data))
 
     # result = Ci::Drone::API.new(@user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, build: params[:build], stage: params[:stage], step: params[:step]).logs