diff options
| author | zeripath <art27@cantab.net> | 2021-07-14 15:43:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 10:43:13 -0400 |
| commit | 3dcb3e9073d825a4ada184f832892cf4bd5836a3 (patch) | |
| tree | aab77b7726f0e20f34b452df166113950ff5fc62 /cmd/mailer.go | |
| parent | ee43d70a0c237ef9c02b99b9b49d1af348840319 (diff) | |
| download | gitea-3dcb3e9073d825a4ada184f832892cf4bd5836a3.tar.gz gitea-3dcb3e9073d825a4ada184f832892cf4bd5836a3.zip | |
Second attempt at preventing zombies (#16326)
* Second attempt at preventing zombies
* Ensure that the pipes are closed in ssh.go
* Ensure that a cancellable context is passed up in cmd/* http requests
* Make cmd.fail return properly so defers are obeyed
* Ensure that something is sent to stdout in case of blocks here
Signed-off-by: Andrew Thornton <art27@cantab.net>
* placate lint
Signed-off-by: Andrew Thornton <art27@cantab.net>
* placate lint 2
Signed-off-by: Andrew Thornton <art27@cantab.net>
* placate lint 3
Signed-off-by: Andrew Thornton <art27@cantab.net>
* fixup
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Apply suggestions from code review
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'cmd/mailer.go')
| -rw-r--r-- | cmd/mailer.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/mailer.go b/cmd/mailer.go index ee11b56cc7..1a4b0902e2 100644 --- a/cmd/mailer.go +++ b/cmd/mailer.go @@ -14,6 +14,9 @@ import ( ) func runSendMail(c *cli.Context) error { + ctx, cancel := installSignals() + defer cancel() + setting.NewContext() if err := argsSet(c, "title"); err != nil { @@ -39,7 +42,7 @@ func runSendMail(c *cli.Context) error { } } - status, message := private.SendEmail(subject, body, nil) + status, message := private.SendEmail(ctx, subject, body, nil) if status != http.StatusOK { fmt.Printf("error: %s\n", message) return nil |