fix level upgrade issue, add error catch. fix last uesd printer logic

This commit is contained in:
Stewart Allen 2019-03-26 10:53:13 -04:00
commit b58a31a1c7
3 changed files with 8 additions and 4 deletions

View file

@ -1124,6 +1124,7 @@ self.kiri.license = exports.LICENSE;
SDB['grid-apik'] = apik; SDB['grid-apik'] = apik;
var res = JSON.parse(xhtr.responseText); var res = JSON.parse(xhtr.responseText);
var sel = false; var sel = false;
var match = false;
var first = null; var first = null;
var html = []; var html = [];
grid_targets = {}; grid_targets = {};
@ -1135,6 +1136,7 @@ self.kiri.license = exports.LICENSE;
} else { } else {
sel = SDB['grid-target'] === key; sel = SDB['grid-target'] === key;
} }
match = match || sel;
grid_targets[html.length] = key; grid_targets[html.length] = key;
html.push( html.push(
"<option id='gpo-'" + key + " value='" +key + "'" + "<option id='gpo-'" + key + " value='" +key + "'" +
@ -1144,7 +1146,7 @@ self.kiri.license = exports.LICENSE;
"</option>" "</option>"
); );
} }
if (!sel) { if (!match) {
SDB['grid-target'] = first; SDB['grid-target'] = first;
} }
grid_target.innerHTML = html.join('\n'); grid_target.innerHTML = html.join('\n');

View file

@ -343,6 +343,9 @@ function setup(req, res, next) {
rec.putTO = null; rec.putTO = null;
db.put(dbikey, dbrec); db.put(dbikey, dbrec);
}, ipSaveDelay); }, ipSaveDelay);
})
.catch(error => {
console.log({dbikey, error});
}); });
// absolute limit on client requests per minute // absolute limit on client requests per minute
@ -704,9 +707,7 @@ var ver = require('../js/license.js'),
valid = require('validator'), valid = require('validator'),
agent = require('express-useragent'), agent = require('express-useragent'),
spawn = require('child_process').spawn, spawn = require('child_process').spawn,
levelup = require('levelup'), level = require('level')('./persist', {valueEncoding:"json"}),
leveldown = require('leveldown'),
level = levelup(leveldown('./persist/'), {valueEncoding:"json"}),
https = require('https'), https = require('https'),
uglify = require('uglify-es'), uglify = require('uglify-es'),
connect = require('connect'), connect = require('connect'),

View file

@ -30,6 +30,7 @@
"compression": "^1.7.3", "compression": "^1.7.3",
"connect": "^3.6.6", "connect": "^3.6.6",
"express-useragent": "^1.0.12", "express-useragent": "^1.0.12",
"level": "^4.0.0",
"levelup": "^4.0.0", "levelup": "^4.0.0",
"leveldown": "^4.0.2", "leveldown": "^4.0.2",
"moment": "^2.22.2", "moment": "^2.22.2",