diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-04-28 16:45:21 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-04-28 17:45:21 +0200 |
| commit | 6a29c5ffd40f1919cac40030c53160c19812bc8d (patch) | |
| tree | f1faaa6504cdb798dfbfd1df20f1493bcdd99602 /internal/middleware/logger.go | |
| parent | [bugfix] Fix remaining mangled URI escaping issues in statuses + accounts (#1... (diff) | |
| download | gotosocial-6a29c5ffd40f1919cac40030c53160c19812bc8d.tar.xz | |
[performance] improved request batching (removes need for queueing) (#1687)
* revamp http client to not limit requests, instead use sender worker
Signed-off-by: kim <grufwub@gmail.com>
* remove separate sender worker pool, spawn 2*GOMAXPROCS batch senders each time, no need for transport cache sweeping
Signed-off-by: kim <grufwub@gmail.com>
* improve batch senders to keep popping recipients until remote URL found
Signed-off-by: kim <grufwub@gmail.com>
* fix recipient looping issue
Signed-off-by: kim <grufwub@gmail.com>
* fix missing mutex unlock
Signed-off-by: kim <grufwub@gmail.com>
* move request id ctx key to gtscontext, finish filling out more code comments, add basic support for not logging client IP
Signed-off-by: kim <grufwub@gmail.com>
* slight code reformatting
Signed-off-by: kim <grufwub@gmail.com>
* a whitespace
Signed-off-by: kim <grufwub@gmail.com>
* remove unused code
Signed-off-by: kim <grufwub@gmail.com>
* add missing license headers
Signed-off-by: kim <grufwub@gmail.com>
* fix request backoff calculation
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/middleware/logger.go')
| -rw-r--r-- | internal/middleware/logger.go | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/internal/middleware/logger.go b/internal/middleware/logger.go index e80488330..50e5542c3 100644 --- a/internal/middleware/logger.go +++ b/internal/middleware/logger.go @@ -34,7 +34,7 @@ import ( func Logger() gin.HandlerFunc { return func(c *gin.Context) { // Initialize the logging fields - fields := make(kv.Fields, 6, 7) + fields := make(kv.Fields, 5, 7) // Determine pre-handler time before := time.Now() @@ -68,11 +68,18 @@ func Logger() gin.HandlerFunc { // Set request logging fields fields[0] = kv.Field{"latency", time.Since(before)} - fields[1] = kv.Field{"clientIP", c.ClientIP()} - fields[2] = kv.Field{"userAgent", c.Request.UserAgent()} - fields[3] = kv.Field{"method", c.Request.Method} - fields[4] = kv.Field{"statusCode", code} - fields[5] = kv.Field{"path", path} + fields[1] = kv.Field{"userAgent", c.Request.UserAgent()} + fields[2] = kv.Field{"method", c.Request.Method} + fields[3] = kv.Field{"statusCode", code} + fields[4] = kv.Field{"path", path} + if includeClientIP := true; includeClientIP { + // TODO: make this configurable. + // + // Include clientIP if enabled. + fields = append(fields, kv.Field{ + "clientIP", c.ClientIP(), + }) + } // Create log entry with fields l := log.WithContext(c.Request.Context()). |