Skip to content

Graceful fixes #8645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 23, 2019
Merged

Graceful fixes #8645

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c12d141
Only attempt to kill parent once
zeripath Oct 23, 2019
5a24ff0
Apply suggestions from code review
zeripath Oct 23, 2019
abbe17c
Merge branch 'master' into graceful-oops
zeripath Oct 23, 2019
8cbd950
Add waitgroup for running servers
zeripath Oct 23, 2019
203058d
Merge branch 'graceful-oops' of github.com:zeripath/gitea into gracef…
zeripath Oct 23, 2019
f439a78
Merge branch 'master' into graceful-oops
zeripath Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions modules/graceful/restart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,24 @@ import (
"os"
"os/exec"
"strings"
"sync"
"syscall"
)

var killParent sync.Once

// KillParent sends the kill signal to the parent process if we are a child
func KillParent() {
killParent.Do(func() {
if IsChild {
ppid := syscall.Getppid()
if ppid > 1 {
_ = syscall.Kill(ppid, syscall.SIGTERM)
}
}
})
}

// RestartProcess starts a new process passing it the active listeners. It
// doesn't fork, but starts a new process using the same environment and
// arguments as when it was originally started. This allows for a newly
Expand Down
8 changes: 2 additions & 6 deletions modules/graceful/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,7 @@ func (srv *Server) ListenAndServe(serve ServeFunction) error {

srv.listener = newWrappedListener(l, srv)

if IsChild {
_ = syscall.Kill(syscall.Getppid(), syscall.SIGTERM)
}
KillParent()

srv.BeforeBegin(srv.network, srv.address)

Expand Down Expand Up @@ -156,9 +154,7 @@ func (srv *Server) ListenAndServeTLSConfig(tlsConfig *tls.Config, serve ServeFun
wl := newWrappedListener(l, srv)
srv.listener = tls.NewListener(wl, tlsConfig)

if IsChild {
_ = syscall.Kill(syscall.Getppid(), syscall.SIGTERM)
}
KillParent()
srv.BeforeBegin(srv.network, srv.address)

return srv.Serve(serve)
Expand Down