From add6eb6e2bb31b28882a5dc72ad143bccd712e99 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 27 Aug 2021 13:26:45 +0200 Subject: Gin logging (#165) * start messing around with logger * more messing about * fix error with instance not created on startup (#156) * set logger * log user agent * finalize logging * go fmt * start messing around with logger * more messing about * set logger * log user agent * finalize logging * go fmt --- internal/router/logger.go | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 internal/router/logger.go (limited to 'internal/router/logger.go') diff --git a/internal/router/logger.go b/internal/router/logger.go new file mode 100644 index 000000000..0daafba22 --- /dev/null +++ b/internal/router/logger.go @@ -0,0 +1,73 @@ +/* + GoToSocial + Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +package router + +import ( + "net/http" + "time" + + "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" +) + +var skipPaths = map[string]interface{}{ + "/api/v1/streaming": nil, +} + +func loggerWithConfig(log *logrus.Logger) gin.HandlerFunc { + logHandler := func(c *gin.Context) { + start := time.Now() + path := c.Request.URL.Path + raw := c.Request.URL.RawQuery + + // Process request + c.Next() + + // Log only when path is not being skipped + if _, ok := skipPaths[path]; !ok { + latency := time.Since(start) + clientIP := c.ClientIP() + userAgent := c.Request.UserAgent() + method := c.Request.Method + statusCode := c.Writer.Status() + errorMessage := c.Errors.ByType(gin.ErrorTypePrivate).String() + bodySize := c.Writer.Size() + if raw != "" { + path = path + "?" + raw + } + + l := log.WithFields(logrus.Fields{ + "latency": latency, + "clientIP": clientIP, + "userAgent": userAgent, + "method": method, + "statusCode": statusCode, + "path": path, + }) + + if errorMessage == "" { + l.Infof("%s: wrote %d bytes in %v", http.StatusText(statusCode), bodySize, latency) + } else { + l.Errorf("%s: %s", http.StatusText(statusCode), errorMessage) + } + } + } + + return logHandler +} -- cgit v1.2.3