mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use circular buffer instead of array for logs

Browse source
This commit is contained in:
Jamie Kyle 2023-03-21 14:23:27 -07:00 • committed by GitHub
parent 379cd3e0ed
commit e4623e2ad5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ts/logging/main_process_logging.ts
View file

@ -22,6 +22,7 @@ import { filter, flatten, map, pick, sortBy } from 'lodash';
import readFirstLine from 'firstline';
import { read as readLastLines } from 'read-last-lines';
import rimraf from 'rimraf';
import { CircularBuffer } from 'cirbuf';
import type { LoggerType } from '../types/Logging';
import * as Errors from '../types/errors';
@ -44,7 +45,7 @@ declare global {
}
}
const MAX_LOG_LINES = 1000000;
const MAX_LOG_LINES = 10_000_000;
let globalLogger: undefined | pino.Logger;
let shouldRestart = false;
@ -287,7 +288,7 @@ export async function eliminateOldEntries(
// Exported for testing only.
export async function fetchLog(logFile: string): Promise<Array<LogEntryType>> {
const results = new Array<LogEntryType>();
const results = new CircularBuffer<LogEntryType>(MAX_LOG_LINES);
const rawStream = createReadStream(logFile);
const jsonStream = rawStream.pipe(
@ -311,12 +312,9 @@ export async function fetchLog(logFile: string): Promise<Array<LogEntryType>> {
}
results.push(result);
if (results.length > MAX_LOG_LINES) {
results.shift();
}
}
return results;
return results.toArray();
}
// Exported for testing only.