diff options
| author | zeripath <art27@cantab.net> | 2019-10-15 14:39:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 14:39:51 +0100 |
| commit | 167e8f18da3aadcdcdd7bb8c488c39d73ac65803 (patch) | |
| tree | c2ad32fc8ced5657f62034551e72134a0a238fcb /routers/init.go | |
| parent | 4a290bd64cd4c4ba77b9f3c4908a76cc521f9621 (diff) | |
| download | gitea-167e8f18da3aadcdcdd7bb8c488c39d73ac65803.tar.gz gitea-167e8f18da3aadcdcdd7bb8c488c39d73ac65803.zip | |
Restore Graceful Restarting & Socket Activation (#7274)
* Prevent deadlock in indexer initialisation during graceful restart
* Move from gracehttp to our own service to add graceful ssh
* Add timeout for start of indexers and make hammer time configurable
* Fix issue with re-initialization in indexer during tests
* move the code to detect use of closed to graceful
* Handle logs gracefully - add a pid suffix just before restart
* Move to using a cond and a holder for indexers
* use time.Since
* Add some comments and attribution
* update modules.txt
* Use zero to disable timeout
* Move RestartProcess to its own file
* Add cleanup routine
Diffstat (limited to 'routers/init.go')
| -rw-r--r-- | routers/init.go | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/routers/init.go b/routers/init.go index c37bbeb6b0..e4e880dbbb 100644 --- a/routers/init.go +++ b/routers/init.go @@ -96,9 +96,7 @@ func GlobalInit() { // Booting long running goroutines. cron.NewContext() - if err := issue_indexer.InitIssueIndexer(false); err != nil { - log.Fatal("Failed to initialize issue indexer: %v", err) - } + issue_indexer.InitIssueIndexer(false) models.InitRepoIndexer() mirror_service.InitSyncMirrors() models.InitDeliverHooks() @@ -112,8 +110,15 @@ func GlobalInit() { } checkRunMode() - if setting.InstallLock && setting.SSH.StartBuiltinServer { - ssh.Listen(setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs) - log.Info("SSH server started on %s:%d. Cipher list (%v), key exchange algorithms (%v), MACs (%v)", setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs) + // Now because Install will re-run GlobalInit once it has set InstallLock + // we can't tell if the ssh port will remain unused until that's done. + // However, see FIXME comment in install.go + if setting.InstallLock { + if setting.SSH.StartBuiltinServer { + ssh.Listen(setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs) + log.Info("SSH server started on %s:%d. Cipher list (%v), key exchange algorithms (%v), MACs (%v)", setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs) + } else { + ssh.Unused() + } } } |