Skip to content
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.

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

Fix logs stop loading #522

Merged
merged 7 commits into from
Mar 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/renderer/ducks/beacon/sagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import {computeEpochAtSlot} from "@chainsafe/lodestar-beacon-state-transition";
import {ValidatorStatus} from "../../constants/validatorStatus";
import {cgLogger, createLogger, getBeaconLogfileFromURL} from "../../../main/logger";
import {setInitialBeacons} from "../settings/actions";
import {DockerRegistry} from "../../services/docker/docker-registry";

export function* pullDockerImage(
network: string,
Expand Down Expand Up @@ -270,6 +271,7 @@ export function* watchOnHead(
isSyncing = result.syncDistance > 10;
isOnline = true;
yield put(updateStatus(isSyncing ? BeaconStatus.syncing : BeaconStatus.active, url));
if (beacon.docker?.id) DockerRegistry.getContainer(beacon.docker?.id).startDockerLogger();
}
beaconLogger.info("Beacon on slot:", payload.value.message.slot);
const headEpoch = computeEpochAtSlot(config?.eth2Config || mainnetConfig, payload.value.message.slot);
Expand Down
27 changes: 22 additions & 5 deletions src/renderer/services/docker/container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {cgLogger, createLogger, mainLogger} from "../../../main/logger";
*/
export interface IDocker {
name: string;
isLoggerAttached: boolean;
stdout?: Readable;
stderr?: Readable;
}
Expand Down Expand Up @@ -123,6 +124,21 @@ export abstract class Container {
}
}

public getIsLoggerAttached(): boolean {
if (this.docker) {
return this.docker.isLoggerAttached;
}
return false;
}

public async startDockerLogger(): Promise<boolean> {
if (!this.getIsLoggerAttached()) {
await this.runDockerLogger();
return true;
}
return false;
}

/**
* Runs docker instance defined trough constructor param.
*
Expand Down Expand Up @@ -254,14 +270,15 @@ export abstract class Container {
}

private async runDockerLogger(): Promise<void> {
const onExit = async (code: number | null, signal: string | null): Promise<void> => {
const onExit = async (): Promise<void> => {
this.docker.isLoggerAttached = false;
this.logger.removeAllStreamSourceListeners(logs.stdout);
this.logger.removeAllStreamSourceListeners(logs.stderr);
if (signal === "SIGTERM" || signal === "SIGINT" || (code === 1 && signal === null)) {
const newLogs = runCmd(await Command.logs(this.params.name, true, 1), {onExit});
if (await this.isRunning()) {
const newLogs = runCmd(await Command.logs(this.params.name, true, 1000), {onExit});
this.addCmdStreamSource(newLogs);
} else {
mainLogger.warn("unhandled exit logger process", code, signal);
mainLogger.warn(`unable to read logs, container: ${this.params.name} is not running`);
}
};
// Use the same way as docker run
Expand All @@ -271,7 +288,7 @@ export abstract class Container {
}

private addCmdStreamSource(run: ICmdRun): void {
this.docker = {name: this.params.name, stdout: run.stdout, stderr: run.stderr};
this.docker = {name: this.params.name, stdout: run.stdout, stderr: run.stderr, isLoggerAttached: true};
this.logger.addStreamSource(run.stdout, "stdout");
this.logger.addStreamSource(run.stderr, "stderr");
}
Expand Down