fix(ui-tweak): Automatically reconnect an account if log settings are…

… updated via UI
postalsys · Mar 27, 2024 · 4d4be15 · 4d4be15
1 parent 3749f89
commit 4d4be15
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/lib/routes-ui.js b/lib/routes-ui.js
@@ -6899,12 +6899,21 @@ ${Buffer.from(data.content, 'base64url').toString('base64')}
                 }
             }
 
+            let logInfo = (await settings.get('logs')) || {
+                all: false,
+                maxLogLines: DEFAULT_MAX_LOG_LINES
+            };
+
+            if (!logInfo.maxLogLines) {
+                logInfo.maxLogLines = DEFAULT_MAX_LOG_LINES;
+            }
+
             return h.view(
                 'accounts/account',
                 {
                     menuAccounts: true,
                     account: accountData,
-                    logs: await settings.get('logs'),
+                    logs: logInfo,
                     smtpError: accountData.smtpStatus && accountData.smtpStatus.status === 'error',
 
                     showSmtp: accountData.smtp || (accountData.oauth2 && accountData.oauth2.provider),
@@ -7087,6 +7096,12 @@ ${Buffer.from(data.content, 'base64url').toString('base64')}
 
                 await redis.hSetExists(accountObject.getAccountKey(), 'logs', request.payload.enabled ? 'true' : 'false');
 
+                try {
+                    await call({ cmd: 'update', account });
+                } catch (err) {
+                    request.logger.error({ msg: 'Reconnect request failed', action: 'request_reconnect', account, err });
+                }
+
                 return {
                     success: true,
                     enabled: (await redis.hget(accountObject.getAccountKey(), 'logs')) === 'true'

diff --git a/views/accounts/account.hbs b/views/accounts/account.hbs
@@ -152,7 +152,12 @@
                 {{/if}}
             </dd>
 
-            <dt class="col-sm-3">Recent logs</dt>
+            <dt class="col-sm-3">Recent logs <a href="#" tabindex="-1" role="button" data-toggle="popover"
+                    data-trigger="hover" style="dispaly: inline-block;"
+                    data-content="Up to last {{logs.maxLogLines}} log lines"><i
+                        class="fas fa-info-circle text-info"></i></a>
+            </dt>
+
             <dd class="col-sm-9">
                 {{#if logs.all}}
                 <div>
@@ -174,10 +179,6 @@
                 </div>
 
                 {{/if}}
-                <div>
-                    <small>Logging is session based so account reconnect is required for logging changes to take into
-                        effect</small>
-                </div>
             </dd>
         </dl>