faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-16 12:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fwatchdog timer memory leak issue

Browse Source 
Use timer.AfterFunc to make sure goroutine could be gc.

Signed-off-by: Mike Chiu <mike.chiu@pentium.network>
This commit is contained in:
Mike Chiu 2018-12-25 13:39:00 +08:00 committed by Alex Ellis
parent cfac88b001
commit 1261aadebe
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
watchdog/handler.go
View File

@ -109,10 +109,7 @@ func pipeRequest(config *WatchdogConfig, w http.ResponseWriter, r *http.Request,
var timer *time.Timer var timer *time.Timer
if config.execTimeout > 0*time.Second { if config.execTimeout > 0*time.Second {
timer = time.NewTimer(config.execTimeout) timer = time.AfterFunc(config.execTimeout, func() {
go func() {
<-timer.C
log.Printf("Killing process: %s\n", config.faasProcess) log.Printf("Killing process: %s\n", config.faasProcess)
if targetCmd != nil && targetCmd.Process != nil { if targetCmd != nil && targetCmd.Process != nil {
ri.headerWritten = true ri.headerWritten = true
@ -125,7 +122,7 @@ func pipeRequest(config *WatchdogConfig, w http.ResponseWriter, r *http.Request,
log.Printf("Killed process: %s - error %s\n", config.faasProcess, val.Error()) log.Printf("Killed process: %s - error %s\n", config.faasProcess, val.Error())
} }
} }
}() })
} }
// Write to pipe in separate go-routine to prevent blocking // Write to pipe in separate go-routine to prevent blocking