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

fix: remove event type

Browse source
This commit is contained in:
Sérgio Salgado 2022-01-20 15:26:26 +00:00
parent b98d73cd6e
commit df4dd5ccb8
4 changed files with 4 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/machine-loader.js
View file

@ -153,7 +153,6 @@ function unpair (rec) {
function reboot (rec) { function reboot (rec) {
return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify( return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify(
{ {
type: 'machineAction',
action: 'reboot', action: 'reboot',
value: _.pick(['deviceId', 'operatorId', 'action'], rec) value: _.pick(['deviceId', 'operatorId', 'action'], rec)
} }
@ -163,7 +162,6 @@ function reboot (rec) {
function shutdown (rec) { function shutdown (rec) {
return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify( return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify(
{ {
type: 'machineAction',
action: 'shutdown', action: 'shutdown',
value: _.pick(['deviceId', 'operatorId', 'action'], rec) value: _.pick(['deviceId', 'operatorId', 'action'], rec)
} }
@ -173,7 +171,6 @@ function shutdown (rec) {
function restartServices (rec) { function restartServices (rec) {
return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify( return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify(
{ {
type: 'machineAction',
action: 'restartServices', action: 'restartServices',
value: _.pick(['deviceId', 'operatorId', 'action'], rec) value: _.pick(['deviceId', 'operatorId', 'action'], rec)
} }

14
lib/middlewares/populateSettings.js
View file

@ -9,12 +9,7 @@ const logger = require('../logger')
db.connect({ direct: true }).then(sco => { db.connect({ direct: true }).then(sco => {
sco.client.on('notification', data => { sco.client.on('notification', data => {
const parsedData = JSON.parse(data.payload) const parsedData = JSON.parse(data.payload)
switch (parsedData.type) { return reload(parsedData.operatorId)
case 'reload':
return reload(parsedData.operatorId)
default:
break
}
}) })
return sco.none('LISTEN $1:name', 'reload') return sco.none('LISTEN $1:name', 'reload')
}).catch(console.error) }).catch(console.error)
@ -22,12 +17,7 @@ db.connect({ direct: true }).then(sco => {
db.connect({ direct: true }).then(sco => { db.connect({ direct: true }).then(sco => {
sco.client.on('notification', data => { sco.client.on('notification', data => {
const parsedData = JSON.parse(data.payload) const parsedData = JSON.parse(data.payload)
switch (parsedData.type) { return machineAction(parsedData.action, parsedData.value)
case 'machineAction':
return machineAction(parsedData.action, parsedData.value)
default:
break
}
}) })
return sco.none('LISTEN $1:name', 'machineAction') return sco.none('LISTEN $1:name', 'machineAction')
}).catch(console.error) }).catch(console.error)

2
lib/new-settings-loader.js
View file

@ -77,7 +77,7 @@ function saveConfig (config) {
const newConfig = _.assign(currentConfig, config) const newConfig = _.assign(currentConfig, config)
return db.tx(t => { return db.tx(t => {
return t.none(configSql, ['config', { config: newConfig }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION]) return t.none(configSql, ['config', { config: newConfig }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
.then(() => t.none('NOTIFY $1:name, $2', ['reload', JSON.stringify({ type: 'reload', schema: asyncLocalStorage.getStore().get('schema'), operatorId })])) .then(() => t.none('NOTIFY $1:name, $2', ['reload', JSON.stringify({ schema: asyncLocalStorage.getStore().get('schema'), operatorId })]))
}).catch(console.error) }).catch(console.error)
}) })
} }

7
lib/poller.js
View file

@ -81,12 +81,7 @@ cachedVariables.on('expired', (key, val) => {
db.connect({ direct: true }).then(sco => { db.connect({ direct: true }).then(sco => {
sco.client.on('notification', data => { sco.client.on('notification', data => {
const parsedData = JSON.parse(data.payload) const parsedData = JSON.parse(data.payload)
switch (parsedData.type) { return reload(parsedData.schema)
case 'reload':
return reload(parsedData.schema)
default:
break
}
}) })
return sco.none('LISTEN $1:name', 'reload') return sco.none('LISTEN $1:name', 'reload')
}).catch(console.error) }).catch(console.error)