ayo/maingate
8
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

watch go 루틴 gracefully exit

Browse Source
This commit is contained in:
mountain
2023-06-13 20:10:08 +09:00
parent 13021c47ce
commit 6d63cce6d0
1 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
core/watch.go
View File

@ -98,7 +98,7 @@ func (mg *Maingate) watchWhitelistCollection(parentctx context.Context) {
changed := stream.TryNext(ctx) changed := stream.TryNext(ctx)
if ctx.Err() != nil { if ctx.Err() != nil {
logger.Error("watchServiceCollection stream.TryNext failed. process should be restarted! :", ctx.Err().Error()) logger.Error("watchWhitelistCollection stream.TryNext failed. process should be restarted! :", ctx.Err().Error())
break break
} }
@ -124,12 +124,20 @@ func (mg *Maingate) watchWhitelistCollection(parentctx context.Context) {
} }
} }
} else { } else {
logger.Error("watchServiceCollection stream.Decode failed :", err) logger.Error("watchWhitelistCollection stream.Decode failed :", err)
} }
} else if stream.Err() != nil || stream.ID() == 0 { } else if stream.Err() != nil || stream.ID() == 0 {
logger.Error("watchServiceCollection stream error :", stream.Err()) select {
stream.Close(ctx) case <-ctx.Done():
stream = nil logger.Println("watchWhitelistCollection is done")
stream.Close(ctx)
return
case <-time.After(time.Second):
logger.Error("watchWhitelistCollection stream error :", stream.Err())
stream.Close(ctx)
stream = nil
}
} else { } else {
time.Sleep(time.Second) time.Sleep(time.Second)
} }
@ -187,9 +195,17 @@ func (mg *Maingate) watchFileCollection(parentctx context.Context, serveMux *htt
if !changed { if !changed {
if stream.Err() != nil || stream.ID() == 0 { if stream.Err() != nil || stream.ID() == 0 {
logger.Error("watchServiceCollection stream error :", stream.Err()) select {
stream.Close(ctx) case <-ctx.Done():
stream = nil logger.Println("watchServiceCollection is done")
stream.Close(ctx)
return
case <-time.After(time.Second):
logger.Error("watchServiceCollection stream error :", stream.Err())
stream.Close(ctx)
stream = nil
}
} else { } else {
time.Sleep(time.Second) time.Sleep(time.Second)
} }
@ -346,9 +362,17 @@ func (mg *Maingate) watchServiceCollection(parentctx context.Context, serveMux *
logger.Error("watchServiceCollection stream.Decode failed :", err) logger.Error("watchServiceCollection stream.Decode failed :", err)
} }
} else if stream.Err() != nil || stream.ID() == 0 { } else if stream.Err() != nil || stream.ID() == 0 {
logger.Error("watchServiceCollection stream error :", stream.Err()) select {
stream.Close(ctx) case <-ctx.Done():
stream = nil logger.Println("watchServiceCollection is done")
stream.Close(ctx)
return
case <-time.After(time.Second):
logger.Error("watchServiceCollection stream error :", stream.Err())
stream.Close(ctx)
stream = nil
}
} else { } else {
time.Sleep(time.Second) time.Sleep(time.Second)
} }
@ -422,9 +446,17 @@ func watchAuthCollection(parentctx context.Context, ac *common.AuthCollection, m
logger.Error("watchAuthCollection stream.Decode failed :", err) logger.Error("watchAuthCollection stream.Decode failed :", err)
} }
} else if stream.Err() != nil || stream.ID() == 0 { } else if stream.Err() != nil || stream.ID() == 0 {
logger.Error("watchAuthCollection stream error :", stream.Err()) select {
stream.Close(ctx) case <-ctx.Done():
stream = nil logger.Println("watchAuthCollection is done")
stream.Close(ctx)
return
case <-time.After(time.Second):
logger.Error("watchAuthCollection stream error :", stream.Err())
stream.Close(ctx)
stream = nil
}
} else { } else {
time.Sleep(time.Second) time.Sleep(time.Second)
} }