fix: (regression 0.24.3) admin/logs: not showing entries where user is logged in
Massimo Melina committed
Aug 9, 2022 at 11:01 UTC
6f5eb35a9d4baad8a11635cc89ca0df59acca1f1
1 file changed
+11
-8
server/src/adminApis.ts
+11
-8
@@ -110,14 +110,17 @@ export const adminApis: ApiHandlers = {
110
return ret
111
112
function parse(line: string) {
113
- const m = /^(.+) - - \[(.{11}):(.{14})] "(\w+) ([^"]+) HTTP\/\d.\d" (\d+) (.+)$/.exec(line)
114
- return m && { // keep object format same as events emitted by the log module
115
- ip: m[1],
116
- ts: new Date(m[2] + ' ' + m[3]),
117
- method: m[4],
118
- uri: m[5],
119
- code: Number(m[6]),
120
- size: m[7] === '-' ? undefined : Number(m[7])
113
+ const m = /^(.+?) - (.+?) \[(.{11}):(.{14})] "(\w+) ([^"]+) HTTP\/\d.\d" (\d+) (.+)$/.exec(line)
114
+ if (!m) return
115
+ const [, ip, user, date, time, method, uri, code, size] = m
116
+ return { // keep object format same as events emitted by the log module
117
+ ip,
118
+ user: user === '-' ? undefined : user,
119
+ ts: new Date(date + ' ' + time),
120
+ method,
121
+ uri,
122
+ code: Number(code),
123
+ size: size === '-' ? undefined : Number(size),
124
}
125
}
126
},