From 26ce36fb8a68d4d0ee8d81096ce33ae7d01bc126 Mon Sep 17 00:00:00 2001 From: emad-salah Date: Mon, 16 Nov 2020 11:44:41 +0100 Subject: [PATCH 1/3] Error logging for fatal exceptions --- services/lnd/lightning.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/lnd/lightning.js b/services/lnd/lightning.js index 89fea045..8be1865e 100644 --- a/services/lnd/lightning.js +++ b/services/lnd/lightning.js @@ -45,6 +45,8 @@ module.exports = async ({ includeDirs: ["node_modules/google-proto-files", "proto"] } + logger.info("Proto file location:", lnrpcProtoPath, routerProtoPath); + const [lnrpcProto, routerProto, walletUnlockerProto] = await Promise.all([protoLoader.load(lnrpcProtoPath, protoLoaderConfig), protoLoader.load(routerProtoPath, protoLoaderConfig), protoLoader.load(walletUnlockerProtoPath, protoLoaderConfig)]); const { lnrpc } = grpc.loadPackageDefinition(lnrpcProto); const { routerrpc } = grpc.loadPackageDefinition(routerProto); From 360398aeec8cde01cc5ec060c84229592336d599 Mon Sep 17 00:00:00 2001 From: emad-salah Date: Mon, 16 Nov 2020 15:32:32 +0100 Subject: [PATCH 2/3] Error logging for fatal exceptions and fixed API crashes in Wizard --- services/lnd/lightning.js | 7 +++---- src/server.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/services/lnd/lightning.js b/services/lnd/lightning.js index 8be1865e..caf232f2 100644 --- a/services/lnd/lightning.js +++ b/services/lnd/lightning.js @@ -1,7 +1,8 @@ +const Path = require("path"); const grpc = require("grpc"); const protoLoader = require("@grpc/proto-loader"); -const fs = require("../../utils/fs"); const logger = require("winston"); +const fs = require("../../utils/fs"); const errorConstants = require("../../constants/errors"); // expose the routes to our app with module.exports @@ -42,11 +43,9 @@ module.exports = async ({ enums: String, defaults: true, oneofs: true, - includeDirs: ["node_modules/google-proto-files", "proto"] + includeDirs: ["node_modules/google-proto-files", "proto", Path.resolve(__dirname, "../../config")] } - logger.info("Proto file location:", lnrpcProtoPath, routerProtoPath); - const [lnrpcProto, routerProto, walletUnlockerProto] = await Promise.all([protoLoader.load(lnrpcProtoPath, protoLoaderConfig), protoLoader.load(routerProtoPath, protoLoaderConfig), protoLoader.load(walletUnlockerProtoPath, protoLoaderConfig)]); const { lnrpc } = grpc.loadPackageDefinition(lnrpcProto); const { routerrpc } = grpc.loadPackageDefinition(routerProto); diff --git a/src/server.js b/src/server.js index d2bbe902..4ba0372f 100644 --- a/src/server.js +++ b/src/server.js @@ -212,7 +212,7 @@ const server = program => { }) app.use((req, res, next) => { - res.set('Version', program.version()) + res.set('Version', program.version ? program.version() : 'N/A') next() }) From a8bf2a55d198341110b72ea03da5cd7ad58a6c64 Mon Sep 17 00:00:00 2001 From: Emad Kheir Date: Tue, 17 Nov 2020 17:46:44 +0100 Subject: [PATCH 3/3] Add custom config paths --- src/server.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server.js b/src/server.js index 4ba0372f..7a0c2a4c 100644 --- a/src/server.js +++ b/src/server.js @@ -29,7 +29,7 @@ const server = program => { // load app default configuration data const defaults = require('../config/defaults')(program.mainnet) - const rootFolder = process.resourcesPath || __dirname + const rootFolder = program.rootPath || process.resourcesPath || __dirname // define env variables Dotenv.config() @@ -216,8 +216,10 @@ const server = program => { next() }) + const storageDirectory = Path.resolve(rootFolder, `${program.rootPath ? '.' : '..'}/.storage`); + await Storage.init({ - dir: Path.resolve(rootFolder, '../.storage') + dir: storageDirectory }) const getSessionSecret = async () => {