From 05a6af49c41fce0beae89375d9642e8fbec15e7e Mon Sep 17 00:00:00 2001 From: Leandro Date: Mon, 12 Feb 2018 11:56:47 +0100 Subject: [PATCH 1/3] fix switch syntax and not throw error when install lock=TRUE --- serve.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serve.js b/serve.js index 499df6cfe..129fd9890 100644 --- a/serve.js +++ b/serve.js @@ -92,7 +92,7 @@ async function serve({ jobs = false, websockets = false } = {}) { } catch (e) { // Check the error. switch (e) { - case (errors.ErrInstallLock, errors.ErrSettingsInit): + case (errors.ErrInstallLock || errors.ErrSettingsInit): debug('setup is not currently available, migrations now being checked'); // The error was expected, just continue. From e9a781607a405659f1bec39246faa3f1c632edd8 Mon Sep 17 00:00:00 2001 From: Leandro Date: Mon, 12 Feb 2018 12:09:28 +0100 Subject: [PATCH 2/3] prettier change --- serve.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serve.js b/serve.js index 129fd9890..137a6ddc3 100644 --- a/serve.js +++ b/serve.js @@ -92,7 +92,7 @@ async function serve({ jobs = false, websockets = false } = {}) { } catch (e) { // Check the error. switch (e) { - case (errors.ErrInstallLock || errors.ErrSettingsInit): + case errors.ErrInstallLock || errors.ErrSettingsInit: debug('setup is not currently available, migrations now being checked'); // The error was expected, just continue. From ec8cfdf5f74aea584fa4caec565633642c15ba9b Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Mon, 12 Feb 2018 19:17:58 -0700 Subject: [PATCH 3/3] fixed logic --- serve.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serve.js b/serve.js index 137a6ddc3..77de110cf 100644 --- a/serve.js +++ b/serve.js @@ -92,7 +92,8 @@ async function serve({ jobs = false, websockets = false } = {}) { } catch (e) { // Check the error. switch (e) { - case errors.ErrInstallLock || errors.ErrSettingsInit: + case errors.ErrInstallLock: + case errors.ErrSettingsInit: debug('setup is not currently available, migrations now being checked'); // The error was expected, just continue.