ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-21 22:47:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2129 from balena-os/patch-journalctl-date-format

Browse Source 
patch: Convert internal timestamp passed to journalctl from number to string
This commit is contained in:
Christina Wang 2023-02-06 18:58:18 -06:00 committed by GitHub
commit 6693a02d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/journald.ts
View File

@ -2,6 +2,17 @@ import { ChildProcess, spawn } from 'child_process';
import log from './supervisor-console';
/**
* Given a date integer in ms, return in a format acceptable by journalctl.
* This function is intended to be used internally. Queries to POST /v2/journal-logs
* should provide `since` and `until` as formats acceptable by journalctl and not
* rely on the Supervisor to convert inputs into an appropriate format.
*
* Example output: '2014-03-25 03:59:56'
*/
export const toJournalDate = (timestamp: number): string =>
new Date(timestamp).toISOString().replace(/T/, ' ').replace(/\..+$/, '');
export function spawnJournalctl(opts: {
all: boolean;
follow: boolean;
@ -10,8 +21,8 @@ export function spawnJournalctl(opts: {
containerId?: string;
format: string;
filterString?: string;
since?: number | string;
until?: number | string;
since?: string;
until?: string;
}): ChildProcess {
const args: string[] = [];
if (opts.all) {
@ -34,11 +45,11 @@ export function spawnJournalctl(opts: {
}
if (opts.since != null) {
args.push('-S');
args.push(opts.since.toString());
args.push(opts.since);
}
if (opts.until != null) {
args.push('-U');
args.push(opts.until.toString());
args.push(opts.until);
}
args.push('-o');
args.push(opts.format);

4
src/logging/monitor.ts
View File

@ -2,7 +2,7 @@ import * as JSONstream from 'JSONStream';
import { delay } from 'bluebird';
import * as db from '../db';
import { spawnJournalctl } from '../lib/journald';
import { spawnJournalctl, toJournalDate } from '../lib/journald';
import log from '../lib/supervisor-console';
export type MonitorHook = ({
@ -152,7 +152,7 @@ class LogMonitor {
follow: false,
format: 'json',
filterString: `CONTAINER_ID_FULL=${containerId}`,
since: lastSentTimestamp + 1, // increment to exclude last sent log
since: toJournalDate(lastSentTimestamp + 1), // increment to exclude last sent log
},
(row: JournalRow) => this.handleRow(row),
async (data: Buffer) => {