Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-27 09:12:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix the channel that never receives a value (#18139)

Browse Source 
fix the channel that never receives a value
fix the code with the linter's recommendation by https://github.com/goharbor/harbor/blob/main/CONTRIBUTING.md#develop-build-and-test

Signed-off-by: iAklis <chenpinwei@gmail.com>
This commit is contained in:
Aklis 2023-05-19 09:17:46 +08:00 committed by GitHub
parent bf7c82b9a8
commit 6a79de761b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/registryctl/api/registry/test/util.go
View File

@ -82,7 +82,7 @@ func GetAnyKey(digests map[digest.Digest]io.ReadSeeker) (d digest.Digest) {
return return
} }
// GetAnyKeys ... // GetKeys ...
func GetKeys(digests map[digest.Digest]io.ReadSeeker) (ds []digest.Digest) { func GetKeys(digests map[digest.Digest]io.ReadSeeker) (ds []digest.Digest) {
for d := range digests { for d := range digests {
ds = append(ds, d) ds = append(ds, d)

5
src/registryctl/main.go
View File

@ -57,6 +57,7 @@ func (s *RegistryCtl) Start() {
TLSConfig: common_http.NewServerTLSConfig(), TLSConfig: common_http.NewServerTLSConfig(),
} }
ctx := context.Background() ctx := context.Background()
shutdown := make(chan struct{})
regCtl.RegisterOnShutdown(tracelib.InitGlobalTracer(ctx)) regCtl.RegisterOnShutdown(tracelib.InitGlobalTracer(ctx))
// graceful shutdown // graceful shutdown
go func() { go func() {
@ -65,6 +66,8 @@ func (s *RegistryCtl) Start() {
<-sig <-sig
context, cancel := context.WithTimeout(ctx, 5*time.Second) context, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel() defer cancel()
defer close(shutdown)
log.Infof("Got an interrupt, shutting down...") log.Infof("Got an interrupt, shutting down...")
if err := regCtl.Shutdown(context); err != nil { if err := regCtl.Shutdown(context); err != nil {
log.Fatalf("Failed to shutdown registry controller: %v", err) log.Fatalf("Failed to shutdown registry controller: %v", err)
@ -81,7 +84,7 @@ func (s *RegistryCtl) Start() {
} else { } else {
err = regCtl.ListenAndServe() err = regCtl.ListenAndServe()
} }
<-ctx.Done() <-shutdown
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }