fix init jenkins

Signed-off-by: soulseen <sunzhu@yunify.com>
This commit is contained in:
soulseen
2019-05-11 13:01:45 +08:00
parent 642d52a45f
commit ecfcad9ea8
3 changed files with 11 additions and 4 deletions

View File

@@ -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) {

View File

@@ -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)