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 /modules/ssh/ssh.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 'modules/ssh/ssh.go')
| -rw-r--r-- | modules/ssh/ssh.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 7ff0c32326..e7a694683a 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -183,12 +183,7 @@ func Listen(host string, port int, ciphers []string, keyExchanges []string, macs log.Error("Failed to set Host Key. %s", err) } - go func() { - err := srv.ListenAndServe() - if err != nil { - log.Error("Failed to serve with builtin SSH server. %s", err) - } - }() + go listen(&srv) } |