Merge branch 'staging' into soon

pull/1/head
ansuz 4 years ago
commit 92560228f5

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

@ -105,7 +105,7 @@
transition: none; transition: none;
.fa, .cptools { .fa, .cptools {
margin-right: 0.2em; margin-right: 5px;
} }
.cptools { .cptools {
vertical-align: middle; vertical-align: middle;

@ -639,7 +639,15 @@ const handleGetHistory = function (Env, Server, seq, userId, parsed) {
Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(msg)], readMore); Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(msg)], readMore);
}, (err) => { }, (err) => {
if (err && err.code !== 'ENOENT') { if (err && err.code !== 'ENOENT') {
if (err.message !== 'EINVAL') { Log.error("HK_GET_HISTORY", { if (err.message === "EUNKNOWN") {
Log.error("HK_GET_HISTORY", {
channel: channelName,
lastKnownHash: lastKnownHash,
userId: userId,
sessions: Object.keys(HK.getNetfluxSession(Env, userId) || {}),
err: err && err.message || err,
});
} else if (err.message !== 'EINVAL') { Log.error("HK_GET_HISTORY", {
channel: channelName, channel: channelName,
err: err && err.message || err, err: err && err.message || err,
stack: err && err.stack, stack: err && err.stack,

Loading…
Cancel
Save