From 3c7232f4277594ac60f12e52b8a61f6ab2a47da4 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Tue, 25 May 2021 21:03:00 +0200
Subject: [PATCH] don't error out when backend log does not exist yet, fixes
 #1977

---
 package-lock.json             | 12 ++++++------
 package.json                  |  2 +-
 src/routes/api/backend_log.js |  8 +++++++-
 src/services/log.js           |  8 ++++++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 02a1f5f00..46f735f52 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2797,9 +2797,9 @@
       }
     },
     "electron": {
-      "version": "13.0.0-beta.27",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.27.tgz",
-      "integrity": "sha512-Co5143QQBiUHLY8qKPbe4axGnFxFLIPbdBuKh0pMvhmsGsVbTK3mEihmhl/lBKQe36cu+gnODpvtZZ0uGsqlxA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0.tgz",
+      "integrity": "sha512-5SgpU7BgR4DJM1TPuZmKQ89A0AMN9vq7J7OfJebbHjsAuYP+rmJwosVna/RpLYFBuQNM90gnny5sffYGDZFQ4w==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -2808,9 +2808,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "14.14.45",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.45.tgz",
-          "integrity": "sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==",
+          "version": "14.17.1",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz",
+          "integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==",
           "dev": true
         }
       }
diff --git a/package.json b/package.json
index d1c6b9210..b9d5a992d 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "electron": "13.0.0-beta.27",
+    "electron": "13.0.0",
     "electron-builder": "22.11.1",
     "electron-packager": "15.2.0",
     "electron-rebuild": "2.3.5",
diff --git a/src/routes/api/backend_log.js b/src/routes/api/backend_log.js
index c91edcc72..b1be19ab6 100644
--- a/src/routes/api/backend_log.js
+++ b/src/routes/api/backend_log.js
@@ -7,7 +7,13 @@ const {LOG_DIR} = require('../../services/data_dir.js');
 function getBackendLog() {
     const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`;
 
-    return fs.readFileSync(file, 'utf8');
+    try {
+        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 = {
diff --git a/src/services/log.js b/src/services/log.js
index 6a30b89f0..1345ce390 100644
--- a/src/services/log.js
+++ b/src/services/log.js
@@ -41,13 +41,17 @@ function initLogFile() {
 function checkDate(millisSinceMidnight) {
     if (millisSinceMidnight >= DAY) {
         initLogFile();
+
+        millisSinceMidnight =- DAY;
     }
+
+    return millisSinceMidnight;
 }
 
 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);