improve logging a little bit

src/entities/note.js

@@ -685,6 +685,7 @@ class Note extends Entity {
         delete pojo.isContentAvailable;
         delete pojo.__attributeCache;
         delete pojo.titleCipherText;
+        delete pojo.noteContent;
     }
 }
 

src/services/notes.js

@@ -292,7 +292,7 @@ async function saveLinks(note, content) {
 async function saveNoteRevision(note) {
     // files and images are immutable, they can't be updated
     // but we don't even version titles which is probably not correct
-    if (note.type !== 'file' || note.type !== 'image' || await note.hasLabel('disableVersioning')) {
+    if (note.type === 'file' || note.type === 'image' || await note.hasLabel('disableVersioning')) {
         return;
     }
 
@@ -311,7 +311,7 @@ async function saveNoteRevision(note) {
             noteId: note.noteId,
             // title and text should be decrypted now
             title: note.title,
-            content: note.noteContent.content,
+            content: await note.getContent(),
             type: note.type,
             mime: note.mime,
             isProtected: false, // will be fixed in the protectNoteRevisions() call

src/services/sql.js

@@ -161,7 +161,7 @@ async function transactional(func) {
     }
 
     let ret = null;
-    const error = new Error(); // to capture correct stack trace in case of exception
+    const thisError = new Error(); // to capture correct stack trace in case of exception
 
     transactionActive = true;
     transactionPromise = new Promise(async (resolve, reject) => {
@@ -179,7 +179,7 @@ async function transactional(func) {
         }
         catch (e) {
             if (transactionActive) {
-                log.error("Error executing transaction, executing rollback. Inner exception: " + e.stack + error.stack);
+                log.error("Error executing transaction, executing rollback. Inner stack: " + e.stack + "\nOutside stack: " + thisError.stack);
 
                 await rollback();