Minor tweaks

server/log.go

@@ -11,19 +11,38 @@ import (
 	"unicode/utf8"
 )
 
+// Log tags
+const (
+	tagStartup      = "startup"
+	tagHTTP         = "http"
+	tagPublish      = "publish"
+	tagSubscribe    = "subscribe"
+	tagFirebase     = "firebase"
+	tagSMTP         = "smtp"  // Receive email
+	tagEmail        = "email" // Send email
+	tagFileCache    = "file_cache"
+	tagMessageCache = "message_cache"
+	tagStripe       = "stripe"
+	tagAccount      = "account"
+	tagManager      = "manager"
+	tagResetter     = "resetter"
+	tagWebsocket    = "websocket"
+	tagMatrix       = "matrix"
+)
+
 // logr creates a new log event with HTTP request fields
 func logr(r *http.Request) *log.Event {
-	return log.Fields(httpContext(r))
+	return log.Tag(tagHTTP).Fields(httpContext(r)) // Tag may be overwritten
 }
 
-// logr creates a new log event with visitor fields
+// logv creates a new log event with visitor fields
 func logv(v *visitor) *log.Event {
 	return log.With(v)
 }
 
-// logr creates a new log event with HTTP request and visitor fields
+// logvr creates a new log event with HTTP request and visitor fields
 func logvr(v *visitor, r *http.Request) *log.Event {
-	return logv(v).Fields(httpContext(r))
+	return logr(r).With(v)
 }
 
 // logvrm creates a new log event with HTTP request, visitor fields and message fields