From 4f9d59be17de6714b33e59d89a64c175aaed9381 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 3 May 2020 00:04:31 +0100 Subject: Sendmail should create a process on the gitea system and have a default timeout (#11256) * Make sure that sendmail processes register with the process manager * Provide a timeout for these (initially of 5 minutes) * Add configurable value and tie in to documentation * Tie in to the admin config page. Signed-off-by: Andrew Thornton --- modules/setting/mailer.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'modules/setting') diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go index c692e0fe14..a2228e938b 100644 --- a/modules/setting/mailer.go +++ b/modules/setting/mailer.go @@ -6,6 +6,7 @@ package setting import ( "net/mail" + "time" "code.gitea.io/gitea/modules/log" @@ -35,8 +36,9 @@ type Mailer struct { IsTLSEnabled bool // Sendmail sender - SendmailPath string - SendmailArgs []string + SendmailPath string + SendmailArgs []string + SendmailTimeout time.Duration } var ( @@ -69,7 +71,8 @@ func newMailService() { IsTLSEnabled: sec.Key("IS_TLS_ENABLED").MustBool(), SubjectPrefix: sec.Key("SUBJECT_PREFIX").MustString(""), - SendmailPath: sec.Key("SENDMAIL_PATH").MustString("sendmail"), + SendmailPath: sec.Key("SENDMAIL_PATH").MustString("sendmail"), + SendmailTimeout: sec.Key("SENDMAIL_TIMEOUT").MustDuration(5 * time.Minute), } MailService.From = sec.Key("FROM").MustString(MailService.User) -- cgit v1.2.3