Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-27 13:49:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2357 from ywk253100/170523_bugfix

Browse Source 
Fix bug
This commit is contained in:
Wenkai Yin 2017-05-23 17:44:49 +08:00 committed by GitHub
commit 51c9c252cc
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jobservice/api/replication.go
View File

@ -211,11 +211,15 @@ func getRepoList(projectID int64) ([]string, error) {
return repositories, err return repositories, err
} }
var list []string var list []*struct {
Name string `json:"name"`
}
if err = json.Unmarshal(body, &list); err != nil { if err = json.Unmarshal(body, &list); err != nil {
return repositories, err 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"))) links := u.ParseLink(resp.Header.Get(http.CanonicalHeaderKey("link")))
next = links.Next() next = links.Next()

1
src/jobservice/job/workerpool.go
View File

@ -124,6 +124,7 @@ func InitWorkerPools() error {
if err != nil { if err != nil {
return err return err
} }
WorkerPools = make(map[Type]*workerPool)
WorkerPools[ReplicationType] = createWorkerPool(maxRepWorker) WorkerPools[ReplicationType] = createWorkerPool(maxRepWorker)
WorkerPools[ScanType] = createWorkerPool(maxScanWorker) WorkerPools[ScanType] = createWorkerPool(maxScanWorker)
return nil return nil

2
src/ui/config/config.go
View File

@ -91,7 +91,7 @@ func initKeyProvider() {
func initSecretStore() { func initSecretStore() {
m := map[string]string{} m := map[string]string{}
m[secret.JobserviceUser] = JobserviceSecret() m[JobserviceSecret()] = secret.JobserviceUser
SecretStore = secret.NewStore(m) SecretStore = secret.NewStore(m)
} }