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

fix: scripts using old options

Browse source
This commit is contained in:
Taranto 2022-12-15 19:55:17 +00:00
parent 008f3c9049
commit fb70a00f77
7 changed files with 8 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

67
lib/migrate-options.js
View file

@ -1,67 +0,0 @@
const _ = require('lodash/fp')
const fs = require('fs')
const os = require('os')
const makeDir = require('make-dir')
const path = require('path')
const cp = require('child_process')
const load = require('./options-loader')
const logger = require('./logger')
// current path of lamassu-server project
const currentBasePath = path.dirname(__dirname)
// get path as array of path components
const paths = _.wrap(_.split, path.sep)
// find the index of the lamassu-server directory
// /usr/lib/node_modules/lamassu-server/certs/Lamassu_OP.pem => 3
const indexOfLs = _.flow(paths, _.wrap(_.indexOf, 'lamassu-server'))
module.exports = {run, mapKeyValuesDeep, updateOptionBasepath}
function mapKeyValuesDeep (cb, obj, key) {
if (_.isArray(obj)) {
return _.mapValues((val, key) => mapKeyValuesDeep(cb, val, key), obj)
} else if (_.isObject(obj)) {
return _.pickBy((val, key) => mapKeyValuesDeep(cb, val, key), obj)
} else {
return cb(obj, key)
}
}
function updateOptionBasepath (result, optionName) {
const currentPath = _.get(optionName, result)
// process only keys that contains
// lamassu-server dir in its path
const i = indexOfLs(currentPath)
if (i === -1) {
return
}
// workout the relative path
// /usr/lib/node_modules/lamassu-server/certs/Lamassu_OP.pem => certs/Lamassu_OP.pem
const rPath = _.drop(i + 1, paths(currentPath))
// prepend the current lamassu-server path
// certs/Lamassu_OP.pem => /usr/local/lib/node_modules/lamassu-server/certs/Lamassu_OP.pem
const newPath = _.join(path.sep, _.concat([currentBasePath], rPath))
// update this option
// if the value has changed
if (!_.isEqual(currentPath, newPath)) {
logger.info(`Migrating option ${optionName} to new path ${newPath}`)
result[optionName] = newPath
}
}
async function run () {
// load current opts
const options = load().opts
const shouldMigrate = !fs.existsSync(path.resolve(__dirname, '../.env'))
// write the resulting .env
if (shouldMigrate) {
const postgresPw = new RegExp(':(\\w*)@').exec(options.postgresql)[1]
cp.spawnSync('node', ['tools/build-prod-env.js', '--db-password', postgresPw, '--hostname', options.hostname], { cwd: currentBasePath, encoding: 'utf-8' })
}
}

9
lib/options.js
View file

@ -1,9 +0,0 @@
const _ = require('lodash/fp')
const argv = require('minimist')(process.argv.slice(2))
const load = require('./options-loader')
const serverConfig = load().opts
const defaults = {logLevel: 'info'}
const commandLine = {logLevel: argv.logLevel}
module.exports = _.mergeAll([defaults, serverConfig, commandLine])

1
lib/plugins/wallet/monerod/monerod.js
View file

@ -7,7 +7,6 @@ const { default: PQueue } = require('p-queue')
const BN = require('../../../bn')
const E = require('../../../error')
const logger = require('../../../logger')
const options = require('../../../options')
const jsonRpc = require('../../common/json-rpc')
const BLOCKCHAIN_DIR = process.env.BLOCKCHAIN_DIR