Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-10 14:44:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

[local-sync, isomophic-core] nicer logging

Browse source
This commit is contained in:
Evan Morikawa 2016-12-20 16:04:08 -08:00
parent e924e74c1b
commit 93db26fdc7
5 changed files with 66 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/isomorphic-core/src/imap-connection.js
View file

@ -295,10 +295,10 @@ class IMAPConnection extends EventEmitter {
resultPromise.then((maybeResult) => { resultPromise.then((maybeResult) => {
this._currentOperation = null; this._currentOperation = null;
this._logger.info({ // this._logger.info({
operation_type: operation.constructor.name, // operation_type: operation.constructor.name,
operation_description: operation.description(), // operation_description: operation.description(),
}, `Finished sync operation`) // }, `Finished sync operation`)
resolve(maybeResult); resolve(maybeResult);
this.processNextOperation(); this.processNextOperation();
}) })

8
packages/local-sync/src/local-sync-worker/imap/fetch-folder-list.js
View file

@ -86,10 +86,10 @@ class FetchFolderList {
const boxName = boxPath.join(box.delimiter); const boxName = boxPath.join(box.delimiter);
this._logger.info({ // this._logger.info({
box_name: boxName, // box_name: boxName,
attributes: JSON.stringify(box.attribs), // attributes: JSON.stringify(box.attribs),
}, `FetchFolderList: Box Information`) // }, `FetchFolderList: Box Information`)
if (box.children && box.attribs.includes('\\HasChildren')) { if (box.children && box.attribs.includes('\\HasChildren')) {

77
packages/local-sync/src/local-sync-worker/imap/fetch-messages-in-folder.js
View file

@ -100,9 +100,9 @@ class FetchMessagesInFolder {
}) })
if (createdUIDs.length > 0) { if (createdUIDs.length > 0) {
this._logger.info({ // this._logger.info({
new_messages: createdUIDs.length, // new_messages: createdUIDs.length,
}, `FetchMessagesInFolder: found new messages. These will not be processed because we assume that they will be assigned uid = uidnext, and will be picked up in the next sync when we discover unseen messages.`); // }, `FetchMessagesInFolder: found new messages. These will not be processed because we assume that they will be assigned uid = uidnext, and will be picked up in the next sync when we discover unseen messages.`);
} }
// Step 2: If flags were changed, apply the changes to the corresponding // Step 2: If flags were changed, apply the changes to the corresponding
@ -155,9 +155,9 @@ class FetchMessagesInFolder {
return; return;
} }
this._logger.info({ // this._logger.info({
removed_messages: removedUIDs.length, // removed_messages: removedUIDs.length,
}, `FetchMessagesInFolder: found messages no longer in the folder`) // }, `FetchMessagesInFolder: found messages no longer in the folder`)
await this._db.sequelize.transaction((transaction) => await this._db.sequelize.transaction((transaction) =>
Message.update({ Message.update({
@ -223,10 +223,10 @@ class FetchMessagesInFolder {
const desiredParts = JSON.parse(key); const desiredParts = JSON.parse(key);
const bodies = ['HEADER'].concat(desiredParts.map(p => p.id)); const bodies = ['HEADER'].concat(desiredParts.map(p => p.id));
this._logger.info({ // this._logger.info({
key, // key,
num_messages: uids.length, // num_messages: uids.length,
}, `FetchMessagesInFolder: Fetching parts for messages`) // }, `FetchMessagesInFolder: Fetching parts for messages`)
// note: the order of UIDs in the array doesn't matter, Gmail always // note: the order of UIDs in the array doesn't matter, Gmail always
// returns them in ascending (oldest => newest) order. // returns them in ascending (oldest => newest) order.
@ -256,18 +256,18 @@ class FetchMessagesInFolder {
if (thread) { if (thread) {
await thread.updateLabelsAndFolders(); await thread.updateLabelsAndFolders();
} }
this._logger.info({ // this._logger.info({
message_id: existingMessage.id, // message_id: existingMessage.id,
uid: existingMessage.folderImapUID, // uid: existingMessage.folderImapUID,
}, `FetchMessagesInFolder: Updated message`) // }, `FetchMessagesInFolder: Updated message`)
} else { } else {
// TODO investigate batching processing new messages // TODO investigate batching processing new messages
// We could measure load of actual sync vs load of just message processing // We could measure load of actual sync vs load of just message processing
// to determine how meaningful it is // to determine how meaningful it is
processNewMessage(messageValues, imapMessage) processNewMessage(messageValues, imapMessage)
this._logger.info({ // this._logger.info({
message: messageValues, // message: messageValues,
}, `FetchMessagesInFolder: Queued new message for processing`) // }, `FetchMessagesInFolder: Queued new message for processing`)
} }
} catch (err) { } catch (err) {
this._logger.error(err, { this._logger.error(err, {
@ -292,12 +292,12 @@ class FetchMessagesInFolder {
const lastUIDValidity = this._folder.syncState.uidvalidity; const lastUIDValidity = this._folder.syncState.uidvalidity;
if (lastUIDValidity && (box.uidvalidity !== lastUIDValidity)) { if (lastUIDValidity && (box.uidvalidity !== lastUIDValidity)) {
this._logger.info({ // this._logger.info({
boxname: box.name, // boxname: box.name,
categoryname: this._folder.name, // categoryname: this._folder.name,
remoteuidvalidity: box.uidvalidity, // remoteuidvalidity: box.uidvalidity,
localuidvalidity: lastUIDValidity, // localuidvalidity: lastUIDValidity,
}, `FetchMessagesInFolder: Recovering from UIDInvalidity`); // }, `FetchMessagesInFolder: Recovering from UIDInvalidity`);
await this._recoverFromUIDInvalidity() await this._recoverFromUIDInvalidity()
} }
@ -312,9 +312,9 @@ class FetchMessagesInFolder {
const desiredRanges = []; const desiredRanges = [];
this._logger.info({ // this._logger.info({
range: `${savedSyncState.fetchedmin}:${savedSyncState.fetchedmax}`, // range: `${savedSyncState.fetchedmin}:${savedSyncState.fetchedmax}`,
}, `FetchMessagesInFolder: Fetching messages.`) // }, `FetchMessagesInFolder: Fetching messages.`)
// Todo: In the future, this is where logic should go that limits // Todo: In the future, this is where logic should go that limits
// sync based on number of messages / age of messages. // sync based on number of messages / age of messages.
@ -326,21 +326,21 @@ class FetchMessagesInFolder {
if (savedSyncState.fetchedmax < boxUidnext) { if (savedSyncState.fetchedmax < boxUidnext) {
desiredRanges.push({min: savedSyncState.fetchedmax, max: boxUidnext}) desiredRanges.push({min: savedSyncState.fetchedmax, max: boxUidnext})
} else { } else {
this._logger.info('FetchMessagesInFolder: fetchedmax == uidnext, nothing more recent to fetch.') // this._logger.info('FetchMessagesInFolder: fetchedmax == uidnext, nothing more recent to fetch.')
} }
if (savedSyncState.fetchedmin > 1) { if (savedSyncState.fetchedmin > 1) {
const lowerbound = Math.max(1, savedSyncState.fetchedmin - FETCH_MESSAGES_COUNT); const lowerbound = Math.max(1, savedSyncState.fetchedmin - FETCH_MESSAGES_COUNT);
desiredRanges.push({min: lowerbound, max: savedSyncState.fetchedmin}) desiredRanges.push({min: lowerbound, max: savedSyncState.fetchedmin})
} else { } else {
this._logger.info("FetchMessagesInFolder: fetchedmin == 1, nothing older to fetch.") // this._logger.info("FetchMessagesInFolder: fetchedmin == 1, nothing older to fetch.")
} }
} }
await PromiseUtils.each(desiredRanges, async ({min, max}) => { await PromiseUtils.each(desiredRanges, async ({min, max}) => {
this._logger.info({ // this._logger.info({
range: `${min}:${max}`, // range: `${min}:${max}`,
}, `FetchMessagesInFolder: Fetching range`); // }, `FetchMessagesInFolder: Fetching range`);
await this._fetchMessagesAndQueueForProcessing(`${min}:${max}`); await this._fetchMessagesAndQueueForProcessing(`${min}:${max}`);
const {fetchedmin, fetchedmax} = this._folder.syncState; const {fetchedmin, fetchedmax} = this._folder.syncState;
@ -353,7 +353,7 @@ class FetchMessagesInFolder {
}); });
}); });
this._logger.info(`FetchMessagesInFolder: Fetching messages finished`); // this._logger.info(`FetchMessagesInFolder: Fetching messages finished`);
} }
_runScan() { _runScan() {
@ -376,15 +376,15 @@ class FetchMessagesInFolder {
let shallowFetch = null; let shallowFetch = null;
if (this._imap.serverSupports(Capabilities.Condstore)) { if (this._imap.serverSupports(Capabilities.Condstore)) {
this._logger.info(`FetchMessagesInFolder: Shallow attribute scan (using CONDSTORE)`) // this._logger.info(`FetchMessagesInFolder: Shallow attribute scan (using CONDSTORE)`)
if (nextHighestmodseq === highestmodseq) { if (nextHighestmodseq === highestmodseq) {
this._logger.info('FetchMessagesInFolder: highestmodseq matches, nothing more to fetch') // this._logger.info('FetchMessagesInFolder: highestmodseq matches, nothing more to fetch')
return Promise.resolve(); return Promise.resolve();
} }
shallowFetch = this._box.fetchUIDAttributes(`1:*`, {changedsince: highestmodseq}); shallowFetch = this._box.fetchUIDAttributes(`1:*`, {changedsince: highestmodseq});
} else { } else {
const range = `${this._getLowerBoundUID(SHALLOW_SCAN_UID_COUNT)}:*`; const range = `${this._getLowerBoundUID(SHALLOW_SCAN_UID_COUNT)}:*`;
this._logger.info({range}, `FetchMessagesInFolder: Shallow attribute scan`) // this._logger.info({range}, `FetchMessagesInFolder: Shallow attribute scan`)
shallowFetch = this._box.fetchUIDAttributes(range); shallowFetch = this._box.fetchUIDAttributes(range);
} }
@ -396,7 +396,7 @@ class FetchMessagesInFolder {
await this._updateMessageAttributes(remoteUIDAttributes, localMessageAttributes) await this._updateMessageAttributes(remoteUIDAttributes, localMessageAttributes)
this._logger.info(`FetchMessagesInFolder: finished fetching changes to messages`); // this._logger.info(`FetchMessagesInFolder: finished fetching changes to messages`);
return this.updateFolderSyncState({ return this.updateFolderSyncState({
highestmodseq: nextHighestmodseq, highestmodseq: nextHighestmodseq,
timeShallowScan: Date.now(), timeShallowScan: Date.now(),
@ -408,7 +408,7 @@ class FetchMessagesInFolder {
const {fetchedmin, fetchedmax} = this._folder.syncState; const {fetchedmin, fetchedmax} = this._folder.syncState;
const range = `${fetchedmin}:${fetchedmax}`; const range = `${fetchedmin}:${fetchedmax}`;
this._logger.info({range}, `FetchMessagesInFolder: Deep attribute scan: fetching attributes in range`) // this._logger.info({range}, `FetchMessagesInFolder: Deep attribute scan: fetching attributes in range`)
const remoteUIDAttributes = await this._box.fetchUIDAttributes(range) const remoteUIDAttributes = await this._box.fetchUIDAttributes(range)
const localMessageAttributes = await Message.findAll({ const localMessageAttributes = await Message.findAll({
@ -421,7 +421,7 @@ class FetchMessagesInFolder {
deletes: this._removeDeletedMessages(remoteUIDAttributes, localMessageAttributes), deletes: this._removeDeletedMessages(remoteUIDAttributes, localMessageAttributes),
}) })
this._logger.info(`FetchMessagesInFolder: Deep scan finished.`); // this._logger.info(`FetchMessagesInFolder: Deep scan finished.`);
return this.updateFolderSyncState({ return this.updateFolderSyncState({
highestmodseq: this._box.highestmodseq, highestmodseq: this._box.highestmodseq,
@ -439,6 +439,7 @@ class FetchMessagesInFolder {
} }
async run(db, imap) { async run(db, imap) {
console.log(`🔃 📂 ${this._folder.name}`)
this._db = db; this._db = db;
this._imap = imap; this._imap = imap;

24
packages/local-sync/src/local-sync-worker/sync-worker.js
View file

@ -266,6 +266,7 @@ class SyncWorker {
return; return;
} }
this._syncStart = Date.now()
clearTimeout(this._syncTimer); clearTimeout(this._syncTimer);
this._syncTimer = null; this._syncTimer = null;
this._interrupted = false this._interrupted = false
@ -280,7 +281,8 @@ class SyncWorker {
return; return;
} }
this._logger.info({reason}, `SyncWorker: Account sync started`) console.log(`🔃 🆕 reason: ${reason}`)
// this._logger.info({reason}, `SyncWorker: Account sync started`)
try { try {
await this._account.update({syncError: null}); await this._account.update({syncError: null});
@ -355,14 +357,15 @@ class SyncWorker {
lastSyncCompletions.pop(); lastSyncCompletions.pop();
} }
this._logger.info('Syncworker: Completed sync cycle'); console.log(`🔃 🔚 took ${now - this._syncStart}ms`)
// this._logger.info('Syncworker: Completed sync cycle');
this._account.lastSyncCompletions = lastSyncCompletions; this._account.lastSyncCompletions = lastSyncCompletions;
this._account.save(); this._account.save();
// Start idling on the inbox // Start idling on the inbox
const idleFolder = await this._getIdleFolder(); const idleFolder = await this._getIdleFolder();
await this._conn.openBox(idleFolder.name); await this._conn.openBox(idleFolder.name);
this._logger.info('SyncWorker: Idling on inbox folder'); // this._logger.info('SyncWorker: Idling on inbox folder');
} }
async scheduleNextSync() { async scheduleNextSync() {
@ -383,13 +386,14 @@ class SyncWorker {
const interval = shouldSyncImmediately ? 1 : intervals.active; const interval = shouldSyncImmediately ? 1 : intervals.active;
const nextSyncIn = Math.max(1, this._lastSyncTime + interval - Date.now()) const nextSyncIn = Math.max(1, this._lastSyncTime + interval - Date.now())
this._logger.info({ // this._logger.info({
moreToSync, // moreToSync,
shouldSyncImmediately, // shouldSyncImmediately,
interrupted: this._interrupted, // interrupted: this._interrupted,
nextSyncStartingIn: `${nextSyncIn}ms`, // nextSyncStartingIn: `${nextSyncIn}ms`,
syncAttemptsWhileInProgress: this._syncAttemptsWhileInProgress, // syncAttemptsWhileInProgress: this._syncAttemptsWhileInProgress,
}, `SyncWorker: Scheduling next sync iteration`) // }, `SyncWorker: Scheduling next sync iteration`)
console.log(`🔃 🔜 in ${nextSyncIn}ms`)
this._syncTimer = setTimeout(() => { this._syncTimer = setTimeout(() => {
this.syncNow({reason}); this.syncNow({reason});

9
packages/local-sync/src/new-message-processor/index.js
View file

@ -28,10 +28,11 @@ function processNewMessage(message, imapMessage) {
await Message.create(message); await Message.create(message);
await extractFiles({db, message, imapMessage}); await extractFiles({db, message, imapMessage});
await extractContacts({db, message}); await extractContacts({db, message});
logger.info({ console.log(`🔃 ✉️ "${message.subject}"`)
message_id: message.id, // logger.info({
uid: message.folderImapUID, // message_id: message.id,
}, `MessageProcessor: Created and processed message`); // uid: message.folderImapUID,
// }, `MessageProcessor: Created and processed message`);
} catch (err) { } catch (err) {
logger.error(err, `MessageProcessor: Failed`); logger.error(err, `MessageProcessor: Failed`);
} }