davide/purple-explorer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better error checking for invalid markets

Browse Source
This commit is contained in:
joeuhren
2020-12-08 22:52:15 -07:00
parent 63fb0ad488
commit 2acb681b5a
4 changed files with 83 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.js
+2 -3
View File
@@ -11,8 +11,7 @@ var express = require('express')
, db = require('./lib/database') , db = require('./lib/database')
, package_metadata = require('./package.json') , package_metadata = require('./package.json')
, locale = require('./lib/locale') , locale = require('./lib/locale')
, request = require('postman-request') , request = require('postman-request');
, fs = require('fs');
var app = express(); var app = express();
@@ -351,7 +350,7 @@ var market_names = {};
settings.markets.enabled.forEach(function (market) { settings.markets.enabled.forEach(function (market) {
// Check if market file exists // Check if market file exists
if (fs.existsSync('./lib/markets/' + market + '.js')) { if (db.fs.existsSync('./lib/markets/' + market + '.js')) {
// Load market file // Load market file
var exMarket = require('./lib/markets/' + market); var exMarket = require('./lib/markets/' + market);
// Save market_name from market file to settings // Save market_name from market file to settings
bin/instance
+12 -9
View File
@@ -28,15 +28,18 @@ db.connect(dbString, function() {
// check markets // check markets
var markets = settings.markets.enabled; var markets = settings.markets.enabled;
for (var i = 0; i < markets.length; i++) { for (var i = 0; i < markets.length; i++) {
db.check_market(markets[i], function(market, exists) { // check if market is installed
if(exists == false) { if (db.fs.existsSync('./lib/markets/' + markets[i] + '.js')) {
console.log('no %s entry found, creating now..', market); db.check_market(markets[i], function(market, exists) {
db.create_market(settings.markets.coin, settings.markets.exchange, market, function(){ if (exists == false) {
}); console.log('no %s entry found, creating now..', market);
} db.create_market(settings.markets.coin, settings.markets.exchange, market, function() {
}); });
} }
});
}
}
db.check_richlist(settings.coin, function(exists){ db.check_richlist(settings.coin, function(exists){
if (exists == false) { if (exists == false) {
console.log('no richlist entry found, creating now..'); console.log('no richlist entry found, creating now..');
lib/database.js
+31 -23
View File
@@ -706,29 +706,35 @@ module.exports = {
// updates market data for given market; called by sync.js // updates market data for given market; called by sync.js
update_markets_db: function(market, cb) { update_markets_db: function(market, cb) {
get_market_data(market, function (err, obj) { // check if market exists
if (err == null) { if (fs.existsSync('./lib/markets/' + market + '.js')) {
Markets.updateOne({market:market}, { get_market_data(market, function (err, obj) {
chartdata: JSON.stringify(obj.chartdata), if (err == null) {
buys: obj.buys, Markets.updateOne({market:market}, {
sells: obj.sells, chartdata: JSON.stringify(obj.chartdata),
history: obj.trades, buys: obj.buys,
summary: obj.stats sells: obj.sells,
}, function() { history: obj.trades,
if ( market == settings.markets.default ) { summary: obj.stats
Stats.updateOne({coin:settings.coin}, { }, function() {
last_price: obj.stats.last, if ( market == settings.markets.default ) {
}, function(){ Stats.updateOne({coin:settings.coin}, {
last_price: obj.stats.last,
}, function(){
return cb(null);
});
} else {
return cb(null); return cb(null);
}); }
} else { });
return cb(null); } else {
} return cb(err);
}); }
} else { });
return cb(err); } else {
} // market does not exist
}); return cb('market is not installed');
}
}, },
get_last_usd_price: function(cb) { get_last_usd_price: function(cb) {
@@ -936,5 +942,7 @@ module.exports = {
return cb(peers); return cb(peers);
} }
}); });
} },
fs: fs
}; };
scripts/sync.js
+38 -31
View File
@@ -7,8 +7,7 @@ var mongoose = require('mongoose')
, Richlist = require('../models/richlist') , Richlist = require('../models/richlist')
, Stats = require('../models/stats') , Stats = require('../models/stats')
, settings = require('../lib/settings') , settings = require('../lib/settings')
, request = require('postman-request') , request = require('postman-request');
, fs = require('fs');
var mode = 'update'; var mode = 'update';
var database = 'index'; var database = 'index';
@@ -72,7 +71,7 @@ if (process.argv[2] == 'index') {
function create_lock(cb) { function create_lock(cb) {
if ( database == 'index' ) { if ( database == 'index' ) {
var fname = './tmp/' + database + '.pid'; var fname = './tmp/' + database + '.pid';
fs.appendFile(fname, process.pid.toString(), function (err) { db.fs.appendFile(fname, process.pid.toString(), function (err) {
if (err) { if (err) {
console.log("Error: unable to create %s", fname); console.log("Error: unable to create %s", fname);
process.exit(1); process.exit(1);
@@ -88,7 +87,7 @@ function create_lock(cb) {
function remove_lock(cb) { function remove_lock(cb) {
if ( database == 'index' ) { if ( database == 'index' ) {
var fname = './tmp/' + database + '.pid'; var fname = './tmp/' + database + '.pid';
fs.unlink(fname, function (err){ db.fs.unlink(fname, function (err) {
if(err) { if(err) {
console.log("unable to remove lock: %s", fname); console.log("unable to remove lock: %s", fname);
process.exit(1); process.exit(1);
@@ -104,7 +103,7 @@ function remove_lock(cb) {
function is_locked(cb) { function is_locked(cb) {
if ( database == 'index' ) { if ( database == 'index' ) {
var fname = './tmp/' + database + '.pid'; var fname = './tmp/' + database + '.pid';
fs.exists(fname, function (exists){ db.fs.exists(fname, function (exists) {
if(exists) { if(exists) {
return cb(true); return cb(true);
} else { } else {
@@ -362,29 +361,37 @@ if (database == 'peers') {
var markets = settings.markets.enabled; var markets = settings.markets.enabled;
var complete = 0; var complete = 0;
for (var x = 0; x < markets.length; x++) { for (var x = 0; x < markets.length; x++) {
var market = markets[x]; // check if market is installed
db.check_market(market, function(mkt, exists) { if (db.fs.existsSync('./lib/markets/' + markets[x] + '.js')) {
if (exists) { db.check_market(markets[x], function(mkt, exists) {
db.update_markets_db(mkt, function(err) { if (exists) {
if (!err) { db.update_markets_db(mkt, function(err) {
console.log('%s market data updated successfully.', mkt); if (!err) {
complete++; console.log('%s market data updated successfully.', mkt);
if (complete == markets.length) complete++;
get_last_usd_price(); if (complete == markets.length)
} else { get_last_usd_price();
console.log('%s: %s', mkt, err); } else {
complete++; console.log('%s: %s', mkt, err);
if (complete == markets.length) complete++;
get_last_usd_price(); if (complete == markets.length)
} get_last_usd_price();
}); }
} else { });
console.log('error: entry for %s does not exists in markets db.', mkt); } else {
complete++; console.log('error: entry for %s does not exists in markets db.', mkt);
if (complete == markets.length) complete++;
if (complete == markets.length)
get_last_usd_price();
}
});
} else {
// market not installed
console.log('%s %s', markets[x], 'market not installed');
complete++;
if (complete == markets.length)
get_last_usd_price(); get_last_usd_price();
} }
});
} }
} }
}); });
@@ -399,9 +406,9 @@ function check_show_sync_message(blocks_to_sync) {
// Check if there are more than 1000 blocks to index // Check if there are more than 1000 blocks to index
if (blocks_to_sync > 1000) { if (blocks_to_sync > 1000) {
// Check if the show sync stub file already exists // Check if the show sync stub file already exists
if (!fs.existsSync(filePath)) { if (!db.fs.existsSync(filePath)) {
// File doesn't exist, so create it now // File doesn't exist, so create it now
fs.writeFileSync(filePath, ''); db.fs.writeFileSync(filePath, '');
} }
retVal = true; retVal = true;
@@ -413,10 +420,10 @@ function check_show_sync_message(blocks_to_sync) {
function remove_sync_message() { function remove_sync_message() {
var filePath = './tmp/show_sync_message.tmp'; var filePath = './tmp/show_sync_message.tmp';
// Check if the show sync stub file exists // Check if the show sync stub file exists
if (fs.existsSync(filePath)) { if (db.fs.existsSync(filePath)) {
// File exists, so delete it now // File exists, so delete it now
try { try {
fs.unlinkSync(filePath); db.fs.unlinkSync(filePath);
} catch (err) { } catch (err) {
console.log(err); console.log(err);
} }