From f3167964f48d76e65994f61d1d4e2460e0bf8621 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle <cjd@cjdns.fr>
Date: Tue, 16 Jan 2018 11:51:09 +0100
Subject: [PATCH] In case there is an error parsing one of the messages in a
 file, catch rather than blowing up

---
 storage/file.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/storage/file.js b/storage/file.js
index 46f8a83f5..5d5d8c3db 100644
--- a/storage/file.js
+++ b/storage/file.js
@@ -257,24 +257,23 @@ var getMessages = function (env, chanName, handler, cb) {
             return;
         }
         var errorState = false;
-        try {
-            readMessages(chan.path, function (msg) {
-                if (!msg || errorState) { return; }
-                //console.log(msg);
+        readMessages(chan.path, function (msg) {
+            if (!msg || errorState) { return; }
+            //console.log(msg);
+            try {
                 handler(msg);
-            }, function (err) {
-                if (err) {
-                    errorState = true;
-                    return void cb(err);
-                }
-                chan.atime = +new Date();
-                cb();
-            });
-        } catch (err2) {
-            console.error(err2);
-            cb(err2);
-            return;
-        }
+            } catch (e) {
+                errorState = true;
+                return void cb(err);
+            }
+        }, function (err) {
+            if (err) {
+                errorState = true;
+                return void cb(err);
+            }
+            chan.atime = +new Date();
+            cb();
+        });
     });
 };