From ecfcad9ea8b01067bc1fb38749a1c3b77e0d29b7 Mon Sep 17 00:00:00 2001
From: soulseen <sunzhu@yunify.com>
Date: Sat, 11 May 2019 13:01:45 +0800
Subject: [PATCH] fix init jenkins

Signed-off-by: soulseen <sunzhu@yunify.com>
---
 cmd/ks-apiserver/app/server.go             | 4 +++-
 pkg/models/devops/devops.go                | 4 ++--
 pkg/simple/client/admin_jenkins/jenkins.go | 7 ++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go
index c3e47be8e..8347bdb0d 100644
--- a/cmd/ks-apiserver/app/server.go
+++ b/cmd/ks-apiserver/app/server.go
@@ -33,6 +33,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/models/devops"
 	logging "kubesphere.io/kubesphere/pkg/models/log"
 	"kubesphere.io/kubesphere/pkg/signals"
+	"kubesphere.io/kubesphere/pkg/simple/client/admin_jenkins"
 	"kubesphere.io/kubesphere/pkg/simple/client/devops_mysql"
 	"log"
 	"net/http"
@@ -99,7 +100,8 @@ func Run(s *options.ServerRunOptions) error {
 }
 
 func initializeAdminJenkins() {
-	devops.PreCheckJenkins()
+	devops.JenkinsInit()
+	admin_jenkins.Client()
 }
 
 func initializeDevOpsDatabase() {
diff --git a/pkg/models/devops/devops.go b/pkg/models/devops/devops.go
index 223155537..461d469a7 100644
--- a/pkg/models/devops/devops.go
+++ b/pkg/models/devops/devops.go
@@ -37,8 +37,8 @@ const channelMaxCapacity = 100
 
 var jenkins *gojenkins.Jenkins
 
-func PreCheckJenkins() {
-	jenkins = admin_jenkins.Client()
+func JenkinsInit() {
+	jenkins = admin_jenkins.GetJenkins()
 }
 
 func GetPipeline(projectName, pipelineName string, req *http.Request) ([]byte, error) {
diff --git a/pkg/simple/client/admin_jenkins/jenkins.go b/pkg/simple/client/admin_jenkins/jenkins.go
index e3801990b..2ebe1c43a 100644
--- a/pkg/simple/client/admin_jenkins/jenkins.go
+++ b/pkg/simple/client/admin_jenkins/jenkins.go
@@ -40,12 +40,17 @@ func init() {
 	flag.IntVar(&jenkinsMaxConn, "jenkins-max-conn", 20, "max conn to jenkins")
 }
 
+func GetJenkins() *gojenkins.Jenkins {
+	jenkins := gojenkins.CreateJenkins(nil, jenkinsAdminAddress, jenkinsMaxConn, jenkinsAdminUsername, jenkinsAdminPassword)
+	return jenkins
+}
+
 func Client() *gojenkins.Jenkins {
 	if jenkinsClient == nil {
 		jenkinsInitMutex.Lock()
 		defer jenkinsInitMutex.Unlock()
 		if jenkinsClient == nil {
-			jenkins := gojenkins.CreateJenkins(nil, jenkinsAdminAddress, jenkinsMaxConn, jenkinsAdminUsername, jenkinsAdminPassword)
+			jenkins := GetJenkins()
 			jenkins, err := jenkins.Init()
 			if err != nil {
 				glog.Errorf("failed to connect jenkins, %+v", err)