diff options
author | Sam Wilkins <samwilkins333@gmail.com> | 2020-01-11 09:56:25 -0500 |
---|---|---|
committer | Sam Wilkins <samwilkins333@gmail.com> | 2020-01-11 09:56:25 -0500 |
commit | cc10010ef690e96b69be575f356d87a6b393c288 (patch) | |
tree | a641bbf708b72ebdbcab97ea0450a64f38ffebab /src | |
parent | 27c93abd49ca8a519d2aa3cf7938434fe25947d7 (diff) |
renaming
Diffstat (limited to 'src')
-rw-r--r-- | src/server/session/agents/server_worker.ts | 2 | ||||
-rw-r--r-- | src/server/session/utilities/ipc.ts | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/session/agents/server_worker.ts b/src/server/session/agents/server_worker.ts index 01e1cf971..2c77cfb29 100644 --- a/src/server/session/agents/server_worker.ts +++ b/src/server/session/agents/server_worker.ts @@ -56,7 +56,7 @@ export class ServerWorker extends MessageRouter { * A convenience wrapper to tell the session monitor (parent process) * to carry out the action with the specified message and arguments. */ - public emitToMonitor = (name: string, args?: any, expectResponse = false) => ServerWorker.IPCManager.emit(name, args, expectResponse); + public emitToMonitor = (name: string, args?: any, awaitResponse = false) => ServerWorker.IPCManager.emit(name, args, awaitResponse); private constructor(work: Function) { super(); diff --git a/src/server/session/utilities/ipc.ts b/src/server/session/utilities/ipc.ts index 37aaa6757..fd8bf6075 100644 --- a/src/server/session/utilities/ipc.ts +++ b/src/server/session/utilities/ipc.ts @@ -23,20 +23,19 @@ export class PromisifiedIPCManager { this.target = target; } - public emit = async (name: string, args?: any, expectResponse = false): Promise<Error | undefined> => { + public emit = async (name: string, args?: any, awaitResponse = false): Promise<Error | undefined> => { if (!this.target.send) { return new Error("Cannot dispatch when send is undefined."); } - if (expectResponse) { + if (awaitResponse) { return new Promise(resolve => { const messageId = Utils.GenerateGuid(); const metadata: any = {}; metadata[this.ipc_id] = messageId; const responseHandler: MessageHandler<InternalMessage> = ({ args, metadata }) => { if (metadata[this.is_response] && metadata[this.ipc_id] === messageId) { - const { error } = args; this.target.removeListener("message", responseHandler); - resolve(error); + resolve(args.error as Error | undefined); } }; this.target.addListener("message", responseHandler); |