root
/
gitdeploy
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

bugfix remove job

This commit is contained in:
AJ ONeal 2020-10-09 09:30:48 +00:00
parent 96c416176f
commit 6cd5581ca6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.go
View File

@ -288,7 +288,7 @@ func serve() {
case hook := <-webhooks.Hooks: case hook := <-webhooks.Hooks:
runHook(hook) runHook(hook)
case jobID := <-killers: case jobID := <-killers:
kill(jobID) remove(jobID, false)
} }
} }
}() }()
@ -359,14 +359,15 @@ func runHook(hook webhooks.Ref) {
log.Printf("gitdeploy job for %s#%s started\n", hook.HTTPSURL, hook.RefName) log.Printf("gitdeploy job for %s#%s started\n", hook.HTTPSURL, hook.RefName)
if err := cmd.Wait(); nil != err { if err := cmd.Wait(); nil != err {
log.Printf("gitdeploy job for %s#%s exited with error: %v", hook.HTTPSURL, hook.RefName, err) log.Printf("gitdeploy job for %s#%s exited with error: %v", hook.HTTPSURL, hook.RefName, err)
return } else {
log.Printf("gitdeploy job for %s#%s finished\n", hook.HTTPSURL, hook.RefName)
} }
log.Printf("gitdeploy job for %s#%s finished\n", hook.HTTPSURL, hook.RefName) remove(jobID, true)
// TODO check for backlog // TODO check for backlog
}() }()
} }
func kill(jobID string) { func remove(jobID string, nokill bool) {
job, exists := jobs[jobID] job, exists := jobs[jobID]
if !exists { if !exists {
return return