gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't error out when backend log does not exist yet, fixes #1977

Browse Source
This commit is contained in:
zadam 2021-05-25 21:03:00 +02:00
parent 5860b2eebb
commit 3c7232f427
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -2797,9 +2797,9 @@
} }
}, },
"electron": { "electron": {
"version": "13.0.0-beta.27", "version": "13.0.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.27.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0.tgz",
"integrity": "sha512-Co5143QQBiUHLY8qKPbe4axGnFxFLIPbdBuKh0pMvhmsGsVbTK3mEihmhl/lBKQe36cu+gnODpvtZZ0uGsqlxA==", "integrity": "sha512-5SgpU7BgR4DJM1TPuZmKQ89A0AMN9vq7J7OfJebbHjsAuYP+rmJwosVna/RpLYFBuQNM90gnny5sffYGDZFQ4w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",
@ -2808,9 +2808,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "14.14.45", "version": "14.17.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.45.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz",
"integrity": "sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==", "integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==",
"dev": true "dev": true
} }
} }

2
package.json
View File

@ -80,7 +80,7 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "7.0.3", "cross-env": "7.0.3",
"electron": "13.0.0-beta.27", "electron": "13.0.0",
"electron-builder": "22.11.1", "electron-builder": "22.11.1",
"electron-packager": "15.2.0", "electron-packager": "15.2.0",
"electron-rebuild": "2.3.5", "electron-rebuild": "2.3.5",

6
src/routes/api/backend_log.js
View File

@ -7,8 +7,14 @@ const {LOG_DIR} = require('../../services/data_dir.js');
function getBackendLog() { function getBackendLog() {
const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`; const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`;
try {
return fs.readFileSync(file, 'utf8'); return fs.readFileSync(file, 'utf8');
} }
catch (e) {
// most probably the log file does not exist yet - https://github.com/zadam/trilium/issues/1977
return "";
}
}
module.exports = { module.exports = {
getBackendLog getBackendLog

8
src/services/log.js
View File

@ -41,13 +41,17 @@ function initLogFile() {
function checkDate(millisSinceMidnight) { function checkDate(millisSinceMidnight) {
if (millisSinceMidnight >= DAY) { if (millisSinceMidnight >= DAY) {
initLogFile(); initLogFile();
millisSinceMidnight =- DAY;
} }
return millisSinceMidnight;
} }
function log(str) { function log(str) {
const millisSinceMidnight = Date.now() - todaysMidnight.getTime(); let millisSinceMidnight = Date.now() - todaysMidnight.getTime();
checkDate(millisSinceMidnight); millisSinceMidnight = checkDate(millisSinceMidnight);
logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE); logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE);