Skip to content

fix: preserve events appended during drain #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antfleet-ops wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve events appended during drain #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions src/commands/events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@ function phaseToEventType(phase: AcpJobPhases): string {
}
}

function readEventLines(file: string): string[] {
try {
const content = readFileSync(file, "utf-8").trim();
return content ? content.split("\n") : [];
} catch {
return [];
}
}

export function registerEventsCommand(program: Command): void {
const events = program
.command("events")
Expand Down Expand Up @@ -311,13 +320,7 @@ export function registerEventsCommand(program: Command): void {
const lockFile = file + ".lock";
renameSync(file, lockFile);

let lines: string[];
try {
const content = readFileSync(lockFile, "utf-8").trim();
lines = content ? content.split("\n") : [];
} catch {
lines = [];
}
const lines = readEventLines(lockFile);

const takeCount =
limit !== undefined && limit > 0
Expand All @@ -326,10 +329,14 @@ export function registerEventsCommand(program: Command): void {
const taken = lines.slice(0, takeCount);
const remaining = lines.slice(takeCount);

// Write remaining events back to original path, then remove lock file
const concurrentlyAppended = readEventLines(file);
const mergedRemaining = [...remaining, ...concurrentlyAppended];

// Write remaining events back to original path, preserving events
// appended by a listener after the original file was renamed.
writeFileSync(
file,
remaining.length > 0 ? remaining.join("\n") + "\n" : ""
mergedRemaining.length > 0 ? mergedRemaining.join("\n") + "\n" : ""
);
try {
unlinkSync(lockFile);
Expand All @@ -347,7 +354,7 @@ export function registerEventsCommand(program: Command): void {
})
.filter(Boolean);

outputResult(json, { events, remaining: remaining.length });
outputResult(json, { events, remaining: mergedRemaining.length });
} catch (err) {
outputError(json, err instanceof Error ? err : String(err));
}
Expand Down