Code cleanup

davbeck · Apr 25, 2020 · de10068 · de10068
1 parent 3a754f9
commit de10068
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/__tests__/runner.test.ts b/__tests__/runner.test.ts
@@ -17,9 +17,7 @@ describe("runner", () => {
 
   it("queues upcoming jobs", () =>
     withPgPool(async pgPool => {
-      const { escapedWorkerSchema, escapedSchedulerSchema } = processOptions(
-        {}
-      );
+      const { escapedWorkerSchema, escapedSchedulerSchema } = processOptions();
 
       await reset({}, pgPool);
       await pgPool.query(`

diff --git a/src/config.ts b/src/config.ts
diff --git a/src/lib.ts b/src/lib.ts
@@ -1,4 +1,3 @@
-import { defaults } from "./config";
 import { RunnerOptions } from "./runner";
 import { Client } from "pg";
 
@@ -7,7 +6,13 @@ export interface CompiledOptions extends RunnerOptions {
   escapedWorkerSchema: string;
 }
 
-export function processOptions(options: RunnerOptions) {
+const defaults = {
+  workerSchema: process.env.GRAPHILE_WORKER_SCHEMA ?? "graphile_worker",
+  schedulerSchema:
+    process.env.GRAPHILE_SCHEDULER_SCHEMA ?? "graphile_scheduler",
+};
+
+export function processOptions(options: RunnerOptions = {}) {
   return {
     ...defaults,
     ...options,

diff --git a/src/runner.ts b/src/runner.ts
@@ -2,7 +2,6 @@ import * as assert from "assert";
 import * as moment from "moment";
 import { Pool } from "pg";
 import { migrate } from "./migrate";
-import { defaults } from "./config";
 import {
   Task,
   RunnerOptions as WorkerRunnerOptions,
@@ -49,18 +48,15 @@ export class Runner {
   interval: NodeJS.Timeout | null;
   workerRunner: WorkerRunner | null;
 
-  constructor(options: RunnerOptions = defaults) {
-    options.schedulerSchema =
-      options.schedulerSchema ?? defaults.schedulerSchema;
-    options.workerSchema = options.workerSchema ?? defaults.workerSchema;
+  constructor(options: RunnerOptions = {}) {
     const {
       schedules,
       pgPool,
       connectionString,
       checkInterval,
       leadTime,
       maxAge,
-      workerSchema = defaults.workerSchema,
+      workerSchema,
       ...workerOptions
     } = options;
     this.options = options;