Archives
/
RTL
mirror of https://github.com/Ride-The-Lightning/RTL
2
0
Fork 0
Code Issues Releases Wiki Activity

Imporved logging for environment variables

Browse Source
pull/49/head
ShahanaFarooqui 5 years ago
parent d1baf977da
commit f24a8972ec
7 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
angular/index.html
Unescape Escape View File

@ -8,5 +8,5 @@
<link rel="stylesheet" href="styles.5e0b52f71274005aea8e.css"></head> <link rel="stylesheet" href="styles.5e0b52f71274005aea8e.css"></head>
<body> <body>
<rtl-app></rtl-app> <rtl-app></rtl-app>
<script type="text/javascript" src="runtime.ec2944dd8b20ec099bf3.js"></script><script type="text/javascript" src="polyfills.418928a701f2040ada02.js"></script><script type="text/javascript" src="main.a25a3ac844b6045994e0.js"></script></body> <script type="text/javascript" src="runtime.ec2944dd8b20ec099bf3.js"></script><script type="text/javascript" src="polyfills.418928a701f2040ada02.js"></script><script type="text/javascript" src="main.6a58ac00262ec13bea69.js"></script></body>
</html> </html>

2
angular/main.a25a3ac844b6045994e0.js → angular/main.6a58ac00262ec13bea69.js
View File

File diff suppressed because one or more lines are too long

20
connect.js
Unescape Escape View File

@ -3,8 +3,8 @@ var clArgs = require('optimist').argv;
var ini = require('ini'); var ini = require('ini');
var common = require('./common'); var common = require('./common');
var path = require('path'); var path = require('path');
var crypto = require('crypto');
var upperCase = require('upper-case'); var upperCase = require('upper-case');
var logger = require('./controllers/logger');
var options = {}; var options = {};
var defaultConfig = { var defaultConfig = {
@ -186,6 +186,22 @@ var setOptions = () => {
}; };
} }
var logEnvVariables = () => {
if (!common.enable_logging) {
return;
}
logger.info('\r\nConfig Setup Variable PORT: ' + common.port);
logger.info('\r\nConfig Setup Variable LND_SERVER_URL: ' + common.lnd_server_url);
logger.info('\r\nConfig Setup Variable MACAROON_PATH: ' + common.macaroon_path);
logger.info('\r\nConfig Setup Variable NODE_AUTH_TYPE: ' + common.node_auth_type);
logger.info('\r\nConfig Setup Variable LND_CONFIG_PATH: ' + common.lnd_config_path);
logger.info('\r\nConfig Setup Variable RTL_CONFIG_PATH: ' + common.rtl_conf_file_path);
logger.info('\r\nConfig Setup Variable BITCOIND_CONFIG_PATH: ' + common.bitcoind_config_path);
logger.info('\r\nConfig Setup Variable RTL_SSO: ' + common.rtl_sso);
logger.info('\r\nConfig Setup Variable RTL_COOKIE_PATH: ' + common.rtl_cookie_path);
logger.info('\r\nConfig Setup Variable LOGOUT_REDIRECT_LINK: ' + common.logout_redirect_link);
}
var errMsg = ''; var errMsg = '';
var configFileExists = () => { var configFileExists = () => {
common.rtl_conf_file_path = (undefined !== process.env.RTL_CONFIG_PATH) ? process.env.RTL_CONFIG_PATH.substring(0, process.env.RTL_CONFIG_PATH.length - 9) : path.normalize(__dirname); common.rtl_conf_file_path = (undefined !== process.env.RTL_CONFIG_PATH) ? process.env.RTL_CONFIG_PATH.substring(0, process.env.RTL_CONFIG_PATH.length - 9) : path.normalize(__dirname);
@ -197,6 +213,7 @@ var configFileExists = () => {
validateConfigFile(config); validateConfigFile(config);
setOptions(); setOptions();
setSSOParams(); setSSOParams();
logEnvVariables();
} else { } else {
try { try {
fs.writeFileSync(RTLConfFile, ini.stringify(defaultConfig)); fs.writeFileSync(RTLConfFile, ini.stringify(defaultConfig));
@ -205,6 +222,7 @@ var configFileExists = () => {
validateConfigFile(config); validateConfigFile(config);
setOptions(); setOptions();
setSSOParams(); setSSOParams();
logEnvVariables();
} }
catch(err) { catch(err) {
console.error('Something went wrong, unable to create config file!\n' + err); console.error('Something went wrong, unable to create config file!\n' + err);

4
controllers/authenticate.js
Unescape Escape View File

@ -17,8 +17,8 @@ exports.authenticateUser = (req, res, next) => {
res.status(200).json({ token: token }); res.status(200).json({ token: token });
} else { } else {
res.status(401).json({ res.status(401).json({
message: "SSO Authentication Failed!", message: "Login Failure!",
error: "Please check app stack configurations!" error: "SSO Authentication Failed!"
}); });
} }
} else { } else {

1
controllers/getInfo.js
Unescape Escape View File

@ -5,6 +5,7 @@ var logger = require('./logger');
exports.getInfo = (req, res, next) => { exports.getInfo = (req, res, next) => {
options.url = common.lnd_server_url + '/getinfo'; options.url = common.lnd_server_url + '/getinfo';
logger.info('\r\nCalling getinfo from lnd server url: INFO: ' + options.url);
request(options).then((body) => { request(options).then((body) => {
logger.info('\r\nGetInfo: 9: ' + JSON.stringify(Date.now()) + ': INFO: ' + JSON.stringify(body)); logger.info('\r\nGetInfo: 9: ' + JSON.stringify(Date.now()) + ': INFO: ' + JSON.stringify(body));
const body_str = (undefined === body) ? '' : JSON.stringify(body); const body_str = (undefined === body) ? '' : JSON.stringify(body);

4
controllers/logger.js
Unescape Escape View File

@ -2,7 +2,9 @@ var fs = require('fs');
var common = require('../common'); var common = require('../common');
exports.info = (msgStr) => { exports.info = (msgStr) => {
console.log('Console: ' + msgStr); if (msgStr.indexOf('Config Setup Variable') === -1) {
console.log('Console: ' + msgStr);
}
if(common.enable_logging) { if(common.enable_logging) {
fs.appendFile(common.log_file, msgStr, function(err) { fs.appendFile(common.log_file, msgStr, function(err) {
if (err) { if (err) {

5
rtl.js
Unescape Escape View File

@ -30,7 +30,7 @@ const onError = error => {
process.exit(1); process.exit(1);
break; break;
case "ECONNREFUSED": case "ECONNREFUSED":
console.error("LND Server is down/locked"); console.error("Server is down/locked");
default: default:
console.error("DEFUALT ERROR"); console.error("DEFUALT ERROR");
console.error(error.code); console.error(error.code);
@ -42,6 +42,7 @@ const onListening = () => {
const addr = server.address(); const addr = server.address();
const bind = typeof addr === "string" ? "pipe " + addr : "port " + port; const bind = typeof addr === "string" ? "pipe " + addr : "port " + port;
debug("Listening on " + bind); debug("Listening on " + bind);
console.log('Server is up and running, please open the UI at http://localhost:' + port);
}; };
const port = normalizePort(process.env.PORT || common.port); const port = normalizePort(process.env.PORT || common.port);
@ -50,4 +51,4 @@ const server = http.createServer(app);
server.on("error", onError); server.on("error", onError);
server.on("listening", onListening); server.on("listening", onListening);
server.listen(port); server.listen(port);
console.log('Server is up and running, please open the UI at http://localhost:' + port);

Write Preview
Loading…
Cancel
Save