fix(errors): Add missing swallowError call, plus debugging URL (#300)

graphile · Sep 22, 2018 · bc66c8f · bc66c8f
1 parent 8f3c0e7
commit bc66c8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/packages/graphile-build-pg/src/plugins/PgQueryProceduresPlugin.js b/packages/graphile-build-pg/src/plugins/PgQueryProceduresPlugin.js
@@ -1,9 +1,5 @@
 // @flow
 import type { Plugin } from "graphile-build";
-import debugFactory from "debug";
-import chalk from "chalk";
-
-const debugWarn = debugFactory("graphile-build-pg:warn");
 
 export default (function PgQueryProceduresPlugin(
   builder,
@@ -21,6 +17,7 @@ export default (function PgQueryProceduresPlugin(
       pgOmit: omit,
       describePgEntity,
       sqlCommentByAddingTags,
+      swallowError,
     } = build;
     const {
       scope: { isRootQuery },
@@ -96,19 +93,7 @@ export default (function PgQueryProceduresPlugin(
                 )}`
               );
             } catch (e) {
-              // eslint-disable-next-line no-console
-              console.warn(
-                chalk.bold.yellow(
-                  `Failed to add function '${proc.namespace.name}.${
-                    proc.name
-                  }'${
-                    debugWarn.enabled
-                      ? ""
-                      : `; run with 'DEBUG="graphile-build-pg:warn"' to view the error`
-                  }`
-                )
-              );
-              debugWarn(e);
+              swallowError(e);
             }
           }
           if (!proc.returnsSet || hasConnections) {

diff --git a/packages/graphile-build/src/swallowError.js b/packages/graphile-build/src/swallowError.js
@@ -21,12 +21,12 @@ export default function swallowError(e: Error): void {
     if (errorSnippet) {
       // eslint-disable-next-line no-console
       console.warn(
-        `Recoverable error occurred; use envvar 'DEBUG="graphile-build:warn"' for full error\n> ${errorSnippet}…`
+        `Recoverable error occurred; use envvar 'DEBUG="graphile-build:warn"' for full error (see: http://graphile.org/postgraphile/debugging )\n> ${errorSnippet}…`
       );
     } else {
       // eslint-disable-next-line no-console
       console.warn(
-        `Recoverable error occurred; use envvar 'DEBUG="graphile-build:warn"' for error`
+        `Recoverable error occurred; use envvar 'DEBUG="graphile-build:warn"' for error (see: http://graphile.org/postgraphile/debugging )`
       );
     }
     debugWarn(e);

diff --git a/packages/postgraphile-core/src/index.ts b/packages/postgraphile-core/src/index.ts
@@ -231,7 +231,13 @@ const getPostGraphileBuilder = async (
         }
       });
     });
-    memoizeCache = JSON.parse(cacheString);
+    try {
+      memoizeCache = JSON.parse(cacheString);
+    } catch (e) {
+      throw new Error(
+        `Failed to parse cache file '${readCache}', perhaps it is corrupted? ${e}`
+      );
+    }
   }
   if (readCache || writeCache) {
     persistentMemoizeWithKey = (key: string, fn: () => any) => {
@@ -348,7 +354,7 @@ export const createPostGraphileSchema = async (
   });
   const schema = builder.buildSchema();
   if (writeCache) {
-    writeCache().catch(abort);
+    await writeCache().catch(abort);
   }
   return schema;
 };