IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Logs: Improve log level guess (#22094)

Browse Source 
Fixes #22075
This commit is contained in:
Emil Tullstedt 2020-03-04 09:48:21 +01:00 committed by GitHub
parent 5166073f98
commit 3c6a7a51bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-data/src/utils/logs.test.ts
View File

@ -35,6 +35,7 @@ describe('getLoglevel()', () => {
it('returns first log level found', () => { it('returns first log level found', () => {
expect(getLogLevel('WARN this could be a debug message')).toBe(LogLevel.warn); expect(getLogLevel('WARN this could be a debug message')).toBe(LogLevel.warn);
expect(getLogLevel('WARN this is a non-critical message')).toBe(LogLevel.warn);
}); });
}); });

15
packages/grafana-data/src/utils/logs.ts
View File

@ -20,16 +20,21 @@ export function getLogLevel(line: string): LogLevel {
if (!line) { if (!line) {
return LogLevel.unknown; return LogLevel.unknown;
} }
let level = LogLevel.unknown;
let currentIndex: number | undefined = undefined;
for (const key of Object.keys(LogLevel)) { for (const key of Object.keys(LogLevel)) {
const regexp = new RegExp(`\\b${key}\\b`, 'i'); const regexp = new RegExp(`\\b${key}\\b`, 'i');
if (regexp.test(line)) { const result = regexp.exec(line);
const level = (LogLevel as any)[key];
if (level) { if (result) {
return level; if (currentIndex === undefined || result.index < currentIndex) {
level = (LogLevel as any)[key];
currentIndex = result.index;
} }
} }
} }
return LogLevel.unknown; return level;
} }
export function getLogLevelFromKey(key: string): LogLevel { export function getLogLevelFromKey(key: string): LogLevel {