From 8e50b9e31f3d32f359502aff4f1d3cbcd684599d Mon Sep 17 00:00:00 2001 From: soulseen Date: Thu, 16 May 2019 20:30:31 +0800 Subject: [PATCH] fix cron check Signed-off-by: soulseen --- pkg/models/devops/devops.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkg/models/devops/devops.go b/pkg/models/devops/devops.go index 7cea449af..98e5ca6b1 100644 --- a/pkg/models/devops/devops.go +++ b/pkg/models/devops/devops.go @@ -421,18 +421,26 @@ func CheckScriptCompile(req *http.Request) ([]byte, error) { } func CheckCron(req *http.Request) (*CheckCronRes, error) { - baseUrl := jenkins.Server + CheckCronUrl + req.URL.RawQuery - log.Infof("Jenkins-url: " + baseUrl) - req.SetBasicAuth(jenkins.Requester.BasicAuth.Username, jenkins.Requester.BasicAuth.Password) - var res = new(CheckCronRes) + newurl, err := url.Parse(jenkins.Server + CheckCronUrl + req.URL.RawQuery) - resp, err := http.Get(baseUrl) + reqJenkins := &http.Request{ + Method: http.MethodGet, + URL: newurl, + Header: http.Header{}, + } + var res = new(CheckCronRes) + client := &http.Client{Timeout: 30 * time.Second} + + reqJenkins.SetBasicAuth(jenkins.Requester.BasicAuth.Username, jenkins.Requester.BasicAuth.Password) + + resp, err := client.Do(reqJenkins) if err != nil { log.Error(err) return res, err } defer resp.Body.Close() + doc, err := goquery.NewDocumentFromReader(resp.Body) if err != nil { log.Error(err)