domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix regression: access log template, gitea manager cli command (#24838)

Browse source 
Close #24836

![image](95b025d2-f25f-4246-a08a-fe44ecb787a9)

![image](c3afe1fa-2a23-420d-a016-3b67dcd04cd5)
This commit is contained in:
wxiaoguang 2023-05-22 09:38:38 +08:00 • committed by GitHub
parent 2d3ebe889e
commit ec2a01d1e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/graceful/manager_unix.go
View file

@ -244,6 +244,10 @@ func (g *Manager) DoGracefulRestart() {
log.Error("Error whilst forking from PID: %d : %v", os.Getpid(), err)
}
}
// doFork calls RestartProcess which starts a new Gitea process, so this parent process needs to exit
// Otherwise some resources (eg: leveldb lock) will be held by this parent process and the new process will fail to start
log.Info("PID: %d. Shutting down after forking ...", os.Getpid())
g.doShutdown()
} else {
log.Info("PID: %d. Not set restartable. Shutting down...", os.Getpid())
g.notify(stoppingMsg)

4
modules/graceful/restart_unix.go
View file

@ -109,5 +109,7 @@ func RestartProcess() (int, error) {
if err != nil {
return 0, err
}
return process.Pid, nil
processPid := process.Pid
_ = process.Release() // no wait, so release
return processPid, nil
}