Merge branch 'nathan-starter' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 26 insertions, 28 deletions

diff --git a/src/server/ProcessFactory.ts b/src/server/ProcessFactory.ts
index f69eda4c3..3791b0e1e 100644
--- a/src/server/ProcessFactory.ts
+++ b/src/server/ProcessFactory.ts
@@ -1,44 +1,42 @@
-import { ChildProcess, spawn, StdioOptions } from "child_process";
-import { existsSync, mkdirSync } from "fs";
-import { Stream } from "stream";
+import { ChildProcess, spawn, StdioOptions } from 'child_process';
+import { existsSync, mkdirSync } from 'fs';
+import { rimraf } from 'rimraf';
+import { Stream } from 'stream';
 import { fileDescriptorFromStream, pathFromRoot } from './ActionUtilities';
-import { rimraf } from "rimraf";
-
-export namespace ProcessFactory {
-
-    export type Sink = "pipe" | "ipc" | "ignore" | "inherit" | Stream | number | null | undefined;
-
-    export async function createWorker(command: string, args?: readonly string[], stdio?: StdioOptions | "logfile", detached = true): Promise<ChildProcess> {
-        if (stdio === "logfile") {
-            const log_fd = await Logger.create(command, args);
-            stdio = ["ignore", log_fd, log_fd];
-        }
-        const child = spawn(command, args ?? [], { detached, stdio });
-        child.unref();
-        return child;
-    }
-
-}
 
 export namespace Logger {
-
-    const logPath = pathFromRoot("./logs");
+    const logPath = pathFromRoot('./logs');
 
     export async function initialize() {
         if (existsSync(logPath)) {
             if (!process.env.SPAWNED) {
-                await new Promise<any>(resolve => rimraf(logPath).then(resolve));
+                await new Promise<any>(resolve => {
+                    rimraf(logPath).then(resolve);
+                });
             }
         }
         mkdirSync(logPath);
     }
 
-    export async function create(command: string, args?: readonly string[]): Promise<number> {
-        return fileDescriptorFromStream(generate_log_path(command, args));
+    function generateLogPath(command: string, args?: readonly string[]) {
+        return pathFromRoot(`./logs/${command}-${args?.length}-${new Date().toUTCString()}.log`);
     }
 
-    function generate_log_path(command: string, args?: readonly string[]) {
-        return pathFromRoot(`./logs/${command}-${args?.length}-${new Date().toUTCString()}.log`);
+    export async function create(command: string, args?: readonly string[]): Promise<number> {
+        return fileDescriptorFromStream(generateLogPath(command, args));
     }
+}
+export namespace ProcessFactory {
+    export type Sink = 'pipe' | 'ipc' | 'ignore' | 'inherit' | Stream | number | null | undefined;
 
-}
\ No newline at end of file
+    export async function createWorker(command: string, args?: readonly string[], stdio?: StdioOptions | 'logfile', detached = true): Promise<ChildProcess> {
+        if (stdio === 'logfile') {
+            const logFd = await Logger.create(command, args);
+            // eslint-disable-next-line no-param-reassign
+            stdio = ['ignore', logFd, logFd];
+        }
+        const child = spawn(command, args ?? [], { detached, stdio });
+        child.unref();
+        return child;
+    }
+}