aboutsummaryrefslogtreecommitdiff
path: root/src/server/DashSession/Session/agents
diff options
context:
space:
mode:
authorSam Wilkins <samwilkins333@gmail.com>2020-10-21 01:11:17 -0700
committerSam Wilkins <samwilkins333@gmail.com>2020-10-21 01:11:17 -0700
commitf9f7ac461534a3cfc9a03490d7803e83ea4d8aad (patch)
tree8c465f951e3b873475a35886fcb3ebc4316957bc /src/server/DashSession/Session/agents
parentcb54708465e64e0499be2af50308358055d6e53e (diff)
Replaced redundant DeconstructedError with ErrorLike
Diffstat (limited to 'src/server/DashSession/Session/agents')
-rw-r--r--src/server/DashSession/Session/agents/monitor.ts6
-rw-r--r--src/server/DashSession/Session/agents/promisified_ipc_manager.ts4
-rw-r--r--src/server/DashSession/Session/agents/server_worker.ts10
3 files changed, 7 insertions, 13 deletions
diff --git a/src/server/DashSession/Session/agents/monitor.ts b/src/server/DashSession/Session/agents/monitor.ts
index 1bbbae0a9..0fdaf07ff 100644
--- a/src/server/DashSession/Session/agents/monitor.ts
+++ b/src/server/DashSession/Session/agents/monitor.ts
@@ -2,14 +2,14 @@ import { ExitHandler } from "./applied_session_agent";
import { Configuration, configurationSchema, defaultConfig, Identifiers, colorMapping } from "../utilities/session_config";
import Repl, { ReplAction } from "../utilities/repl";
import { isWorker, setupMaster, on, Worker, fork } from "cluster";
-import { manage, MessageHandler } from "./promisified_ipc_manager";
+import { manage, MessageHandler, ErrorLike } from "./promisified_ipc_manager";
import { red, cyan, white, yellow, blue } from "colors";
import { exec, ExecOptions } from "child_process";
import { validate, ValidationError } from "jsonschema";
import { Utilities } from "../utilities/utilities";
import { readFileSync } from "fs";
import IPCMessageReceiver from "./process_message_router";
-import { ServerWorker, DeconstructedError } from "./server_worker";
+import { ServerWorker } from "./server_worker";
/**
* Validates and reads the configuration file, accordingly builds a child process factory
@@ -90,7 +90,7 @@ export class Monitor extends IPCMessageReceiver {
}
public readonly coreHooks = Object.freeze({
- onCrashDetected: (listener: MessageHandler<{ error: DeconstructedError }>) => this.on(Monitor.IntrinsicEvents.CrashDetected, listener),
+ onCrashDetected: (listener: MessageHandler<{ error: ErrorLike }>) => this.on(Monitor.IntrinsicEvents.CrashDetected, listener),
onServerRunning: (listener: MessageHandler<{ isFirstTime: boolean }>) => this.on(Monitor.IntrinsicEvents.ServerRunning, listener)
});
diff --git a/src/server/DashSession/Session/agents/promisified_ipc_manager.ts b/src/server/DashSession/Session/agents/promisified_ipc_manager.ts
index fc32c48b4..95aa686e6 100644
--- a/src/server/DashSession/Session/agents/promisified_ipc_manager.ts
+++ b/src/server/DashSession/Session/agents/promisified_ipc_manager.ts
@@ -43,8 +43,8 @@ type InternalMessageHandler = (message: InternalMessage) => (any | Promise<any>)
* Allows for the transmission of the error's key features over IPC.
*/
export interface ErrorLike {
- name?: string;
- message?: string;
+ name: string;
+ message: string;
stack?: string;
}
diff --git a/src/server/DashSession/Session/agents/server_worker.ts b/src/server/DashSession/Session/agents/server_worker.ts
index e3ec4e1c6..afa5fc68d 100644
--- a/src/server/DashSession/Session/agents/server_worker.ts
+++ b/src/server/DashSession/Session/agents/server_worker.ts
@@ -1,6 +1,6 @@
import { ExitHandler } from "./applied_session_agent";
import { isMaster } from "cluster";
-import { manage } from "./promisified_ipc_manager";
+import { manage, ErrorLike } from "./promisified_ipc_manager";
import IPCMessageReceiver from "./process_message_router";
import { red, green, white, yellow } from "colors";
import { get } from "request-promise";
@@ -113,7 +113,7 @@ export class ServerWorker extends IPCMessageReceiver {
this.shouldServerBeResponsive = false;
// communicates via IPC to the master thread that it should dispatch a crash notification email
const { name, message, stack } = error;
- const deconstructed_error: DeconstructedError = { name, message, stack };
+ const deconstructed_error: ErrorLike = { name, message, stack };
this.emit(Monitor.IntrinsicEvents.CrashDetected, { error: deconstructed_error });
await this.executeExitHandlers(error);
// notify master thread (which will log update in the console) of crash event via IPC
@@ -160,9 +160,3 @@ export class ServerWorker extends IPCMessageReceiver {
}
}
-
-export interface DeconstructedError {
- name: string;
- message: string;
- stack: string | undefined;
-} \ No newline at end of file