Merge pull request #38 from mmerickel/corrupted-watchman

do not crash when receiving corrupted json from watchman
Pylons · Oct 5, 2018 · 072bd48 · 072bd48
2 parents 2265801 + 0b18518
commit 072bd48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+unreleased
+==========
+
+- Ignore corrupted packets coming from watchman that occur in semi-random
+  scenarios. See https://github.com/Pylons/hupper/pull/38
+
 1.3 (2018-05-21)
 ================
 

diff --git a/src/hupper/watchman.py b/src/hupper/watchman.py
@@ -132,7 +132,11 @@ def _recv(self):
         line = self._readline()
         if not PY2:
             line = line.decode('utf8')
-        return json.loads(line)
+        try:
+            return json.loads(line)
+        except Exception:  # pragma: no cover
+            self.logger.info('ignoring corrupted payload from watchman')
+            return {}
 
     def _send(self, msg):
         cmd = json.dumps(msg)