parra/ntfy
parra/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2025-06-24 21:38:32 +02:00
Code Releases Activity

Merge branch 'main' into user-account

Browse source
This commit is contained in:
binwiederhier 2023-02-14 21:22:46 -05:00
commit 0df3e3e4f5
9 changed files with 1059 additions and 12764 deletions
server
log.go

13
server/log.go
View file

@ -37,13 +37,12 @@ func logvm(v *visitor, m *message) *log.Event {
}
// logem creates a new log event with email fields
func logem(state *smtp.ConnectionState) *log.Event {
return log.
Tag(tagSMTP).
Fields(log.Context{
"smtp_hostname": state.Hostname,
"smtp_remote_addr": state.RemoteAddr.String(),
})
func logem(smtpConn *smtp.Conn) *log.Event {
ev := log.Tag(tagSMTP).Field("smtp_hostname", smtpConn.Hostname())
if smtpConn.Conn() != nil {
ev.Field("smtp_remote_addr", smtpConn.Conn().RemoteAddr().String())
}
return ev
}
func httpContext(r *http.Request) log.Context {