From 8a8503dcbbf481d28e26c4b93087dcd2277108c2 Mon Sep 17 00:00:00 2001 From: Mauricio Navarro Miranda Date: Tue, 21 Jul 2020 22:55:20 -0500 Subject: [PATCH] fix: server_logs creates inf loop on l-s install fix: flag that skips storing server_logs on DB when table does not yet exists fix: hook server logs migration as soft dependency on initial Revert "fix: hook server logs migration as soft dependency on initial" This reverts commit e6c4cf4419c894598393997637dcfd95a5ff6a0e. fix: empty promise, actually no additional promise was needed --- bin/lamassu-migrate | 1 + lib/db.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/bin/lamassu-migrate b/bin/lamassu-migrate index 29cf1320..0bc473a3 100755 --- a/bin/lamassu-migrate +++ b/bin/lamassu-migrate @@ -24,6 +24,7 @@ const getMigrateFile = () => { db.none(createMigration) .then(() => Promise.all([db.oneOrNone(select), getMigrateFile()])) .then(([qResult, migrateFile]) => { + process.env.SKIP_SERVER_LOGS = !(qResult && qResult.data.migrations.find(({ title }) => title === '1572524820075-server-support-logs.js')) if (!qResult && migrateFile) { return db.none('insert into migrations (id, data) values (1, $1)', [migrateFile]) } diff --git a/lib/db.js b/lib/db.js index 265a1be0..4f59674c 100644 --- a/lib/db.js +++ b/lib/db.js @@ -20,6 +20,8 @@ const pgp = Pgp({ const db = pgp(psqlUrl) eventBus.subscribe('log', args => { + if (process.env.SKIP_SERVER_LOGS) return + const { level, message, meta } = args const msgToSave = message ? message : _.get('message', meta)