Merge branch 'soon' into staging

2020-03-11 16:52:09 -04:00 · 2020-03-11 16:52:09 -04:00 · 9cb92d2e6f
parent 77894b5336 e80a81a2bb
commit 9cb92d2e6f
2 changed files with 2 additions and 1 deletions
--- a/lib/storage/tasks.js
+++ b/lib/storage/tasks.js
@ -102,6 +102,7 @@ var list = Tasks.list = function (env, cb, migration) {
                    root: env.root,
                    error: e,
                });
+                w.abort();
                return void cb(e);
            }
            if (list.length === 0) {
--- a/server.js
+++ b/server.js
@ -55,7 +55,7 @@ if (process.env.PACKAGE) {
        config.httpPort = 3000;
    }

-    if (typeof(httpSafeOrigin) !== 'string') {
+    if (typeof(config.httpSafeOrigin) !== 'string') {
        if (typeof(config.httpSafePort) !== 'number') {
            config.httpSafePort = config.httpPort + 1;
        }