From a173f112dc7a6770ce66f8ee8231c16b7776f6da Mon Sep 17 00:00:00 2001 From: dingguodong Date: Tue, 3 Aug 2021 11:16:34 +0800 Subject: [PATCH] * Change loadModel to access apiGetJobLog func from gitlab module. --- module/ci/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/ci/model.php b/module/ci/model.php index c822096ea7..2af08d66f9 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -140,7 +140,7 @@ class ciModel extends model if(empty($job->duration) or $job->duration == '') $job->duration = '-'; $data->logs = ">>> Job: $job->name, Stage: $job->stage, Status: $job->status, Duration: $job->duration Sec\r\n "; $data->logs .= "Job URL: web_url\" target='_blank'>$job->web_url \r\n"; - $data->logs .= $this->transformAnsiToHtml($this->loadModel('gitlab')->apiGetJobLog($compile->server, $compile->pipeline, $job->id)); + $data->logs .= $this->transformAnsiToHtml($this->gitlab->apiGetJobLog($compile->server, $compile->pipeline, $job->id)); } $this->dao->update(TABLE_COMPILE)->data($data)->where('id')->eq($compile->id)->exec();