Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2025-02-17 13:48:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2669 from MaxLeiter/humandate-refactor

Browse source 
refactor getHumanDate() to accept a timestamp; avoids possible test failure; more accurate log times
This commit is contained in:
Pavel Djundik 2018-07-22 11:39:11 +03:00 • committed by GitHub
commit e8c02d5ad2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/log.js
View file

@ -32,7 +32,7 @@ module.exports = {
read(options, callback); read(options, callback);
}, },
getHumanDate() { getHumanDate(ts) {
return moment().format("YYYY-MM-DD HH:mm:ss"); return moment(ts).format("YYYY-MM-DD HH:mm:ss");
}, },
}; };

2
src/plugins/messageStorage/text.js
View file

@ -41,7 +41,7 @@ class TextFileMessageStorage {
return; return;
} }
let line = `[${log.getHumanDate()}] `; let line = `[${log.getHumanDate(msg.time)}] `;
// message types from src/models/msg.js // message types from src/models/msg.js
switch (msg.type) { switch (msg.type) {

2
test/src/helperTest.js
View file

@ -56,6 +56,6 @@ describe("Helper", function() {
}); });
describe("#getHumanDate()", function() { describe("#getHumanDate()", function() {
expect(log.getHumanDate()).to.equal(moment().format("YYYY-MM-DD HH:mm:ss")); expect(log.getHumanDate(moment(1455090480000).utc())).to.equal("2016-02-10 07:48:00");
}); });
}); });