OrgGo
/
frp
mirror of https://github.com/fatedier/frp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1368 from fatedier/new 

fix health check bug, fix #1367
This commit is contained in:
fatedier 2019-08-09 12:52:46 +08:00 committed by GitHub
parent b657c0fe09 b1838b1d5e
commit 50796643fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/health/health.go
View File

@ -96,12 +96,12 @@ func (monitor *HealthCheckMonitor) Stop() {
func (monitor *HealthCheckMonitor) checkWorker() { func (monitor *HealthCheckMonitor) checkWorker() {
for { for {
ctx, cancel := context.WithDeadline(monitor.ctx, time.Now().Add(monitor.timeout)) doCtx, cancel := context.WithDeadline(monitor.ctx, time.Now().Add(monitor.timeout))
err := monitor.doCheck(ctx) err := monitor.doCheck(doCtx)
// check if this monitor has been closed // check if this monitor has been closed
select { select {
case <-ctx.Done(): case <-monitor.ctx.Done():
cancel() cancel()
return return
default: default:

2
utils/version/version.go
View File

@ -19,7 +19,7 @@ import (
"strings" "strings"
) )
var version string = "0.28.1" var version string = "0.28.2"
func Full() string { func Full() string {
return version return version