From 991e2c367d595ab3a2f7783fd7e376d5e3b4347c Mon Sep 17 00:00:00 2001
From: Nick Steel <nickasteel@gmail.com>
Date: Wed, 22 May 2019 00:58:16 +0100
Subject: [PATCH] network: Close connection following an exception in protocol
 handler.

This goes towards fixing #1762.
---
 docs/changelog.rst                          | 9 +++++++++
 mopidy/internal/network.py                  | 6 +++++-
 tests/internal/network/test_lineprotocol.py | 6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 78de94e0..f036ac8c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,15 @@ This changelog is used to track all major changes to Mopidy.
 For older releases, see :ref:`history`.
 
 
+v2.2.4 (UNRELEASED)
+===================
+
+Bug fix release.
+
+- Network: Close connection following an exception in the protocol handler.
+  (Fixes: :issue:`1762`, PR: :issue:`1765`)
+
+
 v2.2.3 (2019-06-20)
 ===================
 
diff --git a/mopidy/internal/network.py b/mopidy/internal/network.py
index 0c5a9109..d43e1709 100644
--- a/mopidy/internal/network.py
+++ b/mopidy/internal/network.py
@@ -425,8 +425,12 @@ class LineProtocol(pykka.ThreadingActor):
         if not self.prevent_timeout:
             self.connection.enable_timeout()
 
+    def on_failure(self, exception_type, exception_value, traceback):
+        """Clean up connection resouces when actor fails."""
+        self.connection.stop('Actor failed.')
+
     def on_stop(self):
-        """Ensure that cleanup when actor stops."""
+        """Clean up connection resouces when actor stops."""
         self.connection.stop('Actor is shutting down.')
 
     def parse_lines(self):
diff --git a/tests/internal/network/test_lineprotocol.py b/tests/internal/network/test_lineprotocol.py
index 586d180e..a151cef0 100644
--- a/tests/internal/network/test_lineprotocol.py
+++ b/tests/internal/network/test_lineprotocol.py
@@ -121,6 +121,12 @@ class LineProtocolTest(unittest.TestCase):
             self.mock, {'received': 'line1\nline2\n'})
         self.assertEqual(2, self.mock.on_line_received.call_count)
 
+    def test_on_failure_calls_stop(self):
+        self.mock.connection = Mock(spec=network.Connection)
+
+        network.LineProtocol.on_failure(self.mock, None, None, None)
+        self.mock.connection.stop.assert_called_once_with('Actor failed.')
+
     def test_parse_lines_emtpy_buffer(self):
         self.mock.delimiter = re.compile(r'\n')
         self.mock.recv_buffer = ''