mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-08-31 06:46:07 +02:00
Immediately Hammer if second kill is sent (#18823)
Currently Gitea will wait for HammerTime or nice shutdown if kill -1 or kill -2 is sent. We should just immediately hammer if there is a second kill. Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
parent
4b3ebda0e7
commit
83c9035971
2 changed files with 7 additions and 2 deletions
|
@ -193,6 +193,7 @@ func (g *Manager) RunAtHammer(hammer func()) {
|
||||||
|
|
||||||
func (g *Manager) doShutdown() {
|
func (g *Manager) doShutdown() {
|
||||||
if !g.setStateTransition(stateRunning, stateShuttingDown) {
|
if !g.setStateTransition(stateRunning, stateShuttingDown) {
|
||||||
|
g.DoImmediateHammer()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
g.lock.Lock()
|
g.lock.Lock()
|
||||||
|
|
|
@ -168,8 +168,12 @@ func (g *Manager) DoGracefulRestart() {
|
||||||
if setting.GracefulRestartable {
|
if setting.GracefulRestartable {
|
||||||
log.Info("PID: %d. Forking...", os.Getpid())
|
log.Info("PID: %d. Forking...", os.Getpid())
|
||||||
err := g.doFork()
|
err := g.doFork()
|
||||||
if err != nil && err.Error() != "another process already forked. Ignoring this one" {
|
if err != nil {
|
||||||
log.Error("Error whilst forking from PID: %d : %v", os.Getpid(), err)
|
if err.Error() == "another process already forked. Ignoring this one" {
|
||||||
|
g.DoImmediateHammer()
|
||||||
|
} else {
|
||||||
|
log.Error("Error whilst forking from PID: %d : %v", os.Getpid(), err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Info("PID: %d. Not set restartable. Shutting down...", os.Getpid())
|
log.Info("PID: %d. Not set restartable. Shutting down...", os.Getpid())
|
||||||
|
|
Loading…
Reference in a new issue