From fdea1d3a352fd86415de1baa08bab14ec2bab98f Mon Sep 17 00:00:00 2001 From: Andris Reinman Date: Tue, 24 Mar 2020 15:39:04 +0200 Subject: [PATCH] renamed _session to _sess for gelf --- imap-core/lib/imap-connection.js | 2 +- lib/handlers/on-auth.js | 4 ++-- lib/handlers/on-copy.js | 2 +- lib/message-handler.js | 8 ++++---- lib/tasks/quota.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/imap-core/lib/imap-connection.js b/imap-core/lib/imap-connection.js index 0e9defac..38a38239 100644 --- a/imap-core/lib/imap-connection.js +++ b/imap-core/lib/imap-connection.js @@ -363,7 +363,7 @@ class IMAPConnection extends EventEmitter { short_message: '[CONNRELEASE] Connection released for ' + this.user.id, _connection: 'release', _service: 'imap', - _session: this.session && this.session.id, + _sess: this.session && this.session.id, _user: this.user.id, _cid: this.id, _ip: this.remoteAddress diff --git a/lib/handlers/on-auth.js b/lib/handlers/on-auth.js index 1739080c..3a7147ec 100644 --- a/lib/handlers/on-auth.js +++ b/lib/handlers/on-auth.js @@ -50,7 +50,7 @@ module.exports = (server, userHandler, userCache) => (login, session, callback) short_message: '[CONNSTART] Connection established for ' + result.user, _connection: 'establish', _service: 'imap', - _session: session && session.id, + _sess: session && session.id, _user: result.user, _cid: connection.id, _ip: connection.remoteAddress, @@ -61,7 +61,7 @@ module.exports = (server, userHandler, userCache) => (login, session, callback) short_message: '[CONNFAILED] Connection failed for ' + result.user, _connection: 'limited', _service: 'imap', - _session: session && session.id, + _sess: session && session.id, _user: result.user, _cid: connection.id, _ip: connection.remoteAddress, diff --git a/lib/handlers/on-copy.js b/lib/handlers/on-copy.js index d3743104..b047216c 100644 --- a/lib/handlers/on-copy.js +++ b/lib/handlers/on-copy.js @@ -93,7 +93,7 @@ module.exports = (server, messageHandler) => (mailbox, update, session, callback _copied_messages: copiedMessages, _storage_used: r.value.storageUsed, _mailbox: targetData._id, - _session: session && session.id + _sess: session && session.id }); } next(); diff --git a/lib/message-handler.js b/lib/message-handler.js index 81e5740b..3ce3e510 100644 --- a/lib/message-handler.js +++ b/lib/message-handler.js @@ -331,7 +331,7 @@ class MessageHandler { _user: mailboxData.user, _inc: size, _storage_used: r.value.storageUsed, - _session: options.session && options.session.id, + _sess: options.session && options.session.id, _mailbox: mailboxData._id }); } @@ -362,7 +362,7 @@ class MessageHandler { _user: mailboxData.user, _inc: -size, _storage_used: r.value.storageUsed, - _session: options.session && options.session.id, + _sess: options.session && options.session.id, _mailbox: mailboxData._id, _rollback: 'yes', _error: err.message, @@ -554,7 +554,7 @@ class MessageHandler { _user: user, _inc: inc.storageUsed, _storage_used: r.value.storageUsed, - _session: options.session && options.session.id, + _sess: options.session && options.session.id, _mailbox: inc.mailbox }); } @@ -602,7 +602,7 @@ class MessageHandler { _uid: messageData.uid, _message_id: messageData._id, _expires: messageData.rdate, - _session: options.session && options.session.id, + _sess: options.session && options.session.id, _size: messageData.size }); } diff --git a/lib/tasks/quota.js b/lib/tasks/quota.js index 42c9c46e..8a05886f 100644 --- a/lib/tasks/quota.js +++ b/lib/tasks/quota.js @@ -88,7 +88,7 @@ module.exports = (taskData, options, callback) => { _set: Number(storageUsed) || 0, _previous_storage_used: r.value.storageUsed, _storage_used: Number(storageUsed) || 0, - _session: 'task.quota.' + taskData._id + _sess: 'task.quota.' + taskData._id }); }