From 19e38451c2234d0662357c93c5c0930cf7c73097 Mon Sep 17 00:00:00 2001
From: Ben Gotow <ben@foundry376.com>
Date: Tue, 3 Oct 2017 00:57:06 -0700
Subject: [PATCH] =?UTF-8?q?=E2=80=9COpen=20Mailsync=20logs=E2=80=9D=20shou?=
 =?UTF-8?q?ld=20just=20open=20folder=20now=20that=20accounts=20log=20separ?=
 =?UTF-8?q?ately?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/flux/mailsync-bridge.es6 | 9 +++++----
 mailsync                         | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/flux/mailsync-bridge.es6 b/app/src/flux/mailsync-bridge.es6
index 3af0f2229..0312b7ee5 100644
--- a/app/src/flux/mailsync-bridge.es6
+++ b/app/src/flux/mailsync-bridge.es6
@@ -65,8 +65,9 @@ class CrashTracker {
     err.stack = stack;
 
     let log = '';
+    const logfile = `mailsync-${fullAccountJSON.id}.log`;
     try {
-      const logpath = path.join(AppEnv.getConfigDirPath(), 'mailsync.log');
+      const logpath = path.join(AppEnv.getConfigDirPath(), logfile);
       const { size } = fs.statSync(logpath);
       const tailSize = Math.min(1200, size);
       const buffer = new Buffer(tailSize);
@@ -75,7 +76,7 @@ class CrashTracker {
       log = buffer.toString('UTF8');
       log = log.substr(log.indexOf('\n') + 1);
     } catch (logErr) {
-      console.warn(`Could not append mailsync.log to mailsync exception report: ${logErr}`);
+      console.warn(`Could not append ${logfile} to mailsync exception report: ${logErr}`);
     }
 
     AppEnv.errorLogger.reportError(err, {
@@ -140,8 +141,8 @@ export default class MailsyncBridge {
 
   openLogs() {
     const { configDirPath } = AppEnv.getLoadSettings();
-    const logPath = path.join(configDirPath, 'mailsync.log');
-    require('electron').shell.openItem(logPath); // eslint-disable-line
+    const configDirItem = path.join(configDirPath, 'config.json');
+    require('electron').shell.showItemInFolder(configDirItem); // eslint-disable-line
   }
 
   clients() {
diff --git a/mailsync b/mailsync
index f9d4c183b..45e6a4303 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit f9d4c183bdfdac8fb0ad8199a115f34a3d1873bd
+Subproject commit 45e6a43039a01b86e9f2fb0810941ed249ce528d