lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: server_logs creates inf loop on l-s install

Browse source 
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
This commit is contained in:
Mauricio Navarro Miranda 2020-07-21 22:55:20 -05:00 • committed by Josh Harvey
parent 4b98f3503f
commit 8a8503dcbb
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bin/lamassu-migrate
View file

@ -24,6 +24,7 @@ const getMigrateFile = () => {
db.none(createMigration) db.none(createMigration)
.then(() => Promise.all([db.oneOrNone(select), getMigrateFile()])) .then(() => Promise.all([db.oneOrNone(select), getMigrateFile()]))
.then(([qResult, migrateFile]) => { .then(([qResult, migrateFile]) => {
process.env.SKIP_SERVER_LOGS = !(qResult && qResult.data.migrations.find(({ title }) => title === '1572524820075-server-support-logs.js'))
if (!qResult && migrateFile) { if (!qResult && migrateFile) {
return db.none('insert into migrations (id, data) values (1, $1)', [migrateFile]) return db.none('insert into migrations (id, data) values (1, $1)', [migrateFile])
} }

2
lib/db.js
View file

@ -20,6 +20,8 @@ const pgp = Pgp({
const db = pgp(psqlUrl) const db = pgp(psqlUrl)
eventBus.subscribe('log', args => { eventBus.subscribe('log', args => {
if (process.env.SKIP_SERVER_LOGS) return
const { level, message, meta } = args const { level, message, meta } = args
const msgToSave = message ? message : _.get('message', meta) const msgToSave = message ? message : _.get('message', meta)