Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow HOST has no port #22280

Merged
merged 13 commits into from
Jan 11, 2023
Merged

Allow HOST has no port #22280

Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
da6685a
Allow HOST has no port
lunny Dec 30, 2022
3cbfea6
some improvement
lunny Jan 9, 2023
c8a58f5
Merge branch 'main' into lunny/allow_missing_port_smtp
lunny Jan 9, 2023
7a848d3
Merge branch 'main' into lunny/allow_missing_port_smtp
lunny Jan 9, 2023
4d3978c
Merge branch 'main' into lunny/allow_missing_port_smtp
lunny Jan 10, 2023
f10eb74
Merge branch 'main' into lunny/allow_missing_port_smtp
lunny Jan 10, 2023
0ab6ffa
Update modules/setting/mailer.go
lunny Jan 10, 2023
8f67b6d
Fix fmt
lunny Jan 10, 2023
6d5f5fd
Merge branch 'main' into lunny/allow_missing_port_smtp
zeripath Jan 10, 2023
c8a413b
Add test for mailer setting
lunny Jan 11, 2023
42de449
Merge branch 'lunny/allow_missing_port_smtp' of github.com:lunny/gite…
lunny Jan 11, 2023
3dbeba6
Fix check
lunny Jan 11, 2023
14f4327
Merge branch 'main' into lunny/allow_missing_port_smtp
lunny Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion modules/setting/mailer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,12 @@ func newMailService() {
if sec.HasKey("HOST") && !sec.HasKey("SMTP_ADDR") {
givenHost := sec.Key("HOST").String()
addr, port, err := net.SplitHostPort(givenHost)
if err != nil {
if err != nil && err.Error() != "missing port in address" {
log.Fatal("Invalid mailer.HOST (%s): %v", givenHost, err)
}
if addr == "" {
addr = "127.0.0.1"
}
lunny marked this conversation as resolved.
Show resolved Hide resolved
sec.Key("SMTP_ADDR").MustString(addr)
sec.Key("SMTP_PORT").MustString(port)
}
Expand Down