admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #435 from soulseen/master

Browse Source 
fix cron check
This commit is contained in:
runzexia
2019-05-16 22:35:51 +08:00
committed by GitHub
parent 257844ea7c 998e622b52
commit 9c5dcf747f
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/models/devops/devops.go
View File

@@ -421,18 +421,26 @@ func CheckScriptCompile(req *http.Request) ([]byte, error) {
} }
func CheckCron(req *http.Request) (*CheckCronRes, error) { func CheckCron(req *http.Request) (*CheckCronRes, error) {
baseUrl := jenkins.Server + CheckCronUrl + req.URL.RawQuery newurl, err := url.Parse(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)
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 { if err != nil {
log.Error(err) log.Error(err)
return res, err return res, err
} }
defer resp.Body.Close() defer resp.Body.Close()
doc, err := goquery.NewDocumentFromReader(resp.Body) doc, err := goquery.NewDocumentFromReader(resp.Body)
if err != nil { if err != nil {
log.Error(err) log.Error(err)