From 0e237d8cabfcf50e9f1915de3da862baf3aef190 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 23 May 2017 16:28:10 +0800 Subject: [PATCH] fix bug --- src/jobservice/api/replication.go | 8 ++++++-- src/jobservice/job/workerpool.go | 1 + src/ui/config/config.go | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/jobservice/api/replication.go b/src/jobservice/api/replication.go index 98a203348..169e54f5f 100644 --- a/src/jobservice/api/replication.go +++ b/src/jobservice/api/replication.go @@ -211,11 +211,15 @@ func getRepoList(projectID int64) ([]string, error) { return repositories, err } - var list []string + var list []*struct { + Name string `json:"name"` + } if err = json.Unmarshal(body, &list); err != nil { return repositories, err } - repositories = append(repositories, list...) + for _, repo := range list { + repositories = append(repositories, repo.Name) + } links := u.ParseLink(resp.Header.Get(http.CanonicalHeaderKey("link"))) next = links.Next() diff --git a/src/jobservice/job/workerpool.go b/src/jobservice/job/workerpool.go index 2969a9163..0b16e0861 100644 --- a/src/jobservice/job/workerpool.go +++ b/src/jobservice/job/workerpool.go @@ -124,6 +124,7 @@ func InitWorkerPools() error { if err != nil { return err } + WorkerPools = make(map[Type]*workerPool) WorkerPools[ReplicationType] = createWorkerPool(maxRepWorker) WorkerPools[ScanType] = createWorkerPool(maxScanWorker) return nil diff --git a/src/ui/config/config.go b/src/ui/config/config.go index bfbf77c77..f123d186f 100644 --- a/src/ui/config/config.go +++ b/src/ui/config/config.go @@ -91,7 +91,7 @@ func initKeyProvider() { func initSecretStore() { m := map[string]string{} - m[secret.JobserviceUser] = JobserviceSecret() + m[JobserviceSecret()] = secret.JobserviceUser SecretStore = secret.NewStore(m) }