From aa010e03e995d68913a071793f1847a1ac8cd356 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Fri, 4 Dec 2015 23:38:55 +0100
Subject: [PATCH] listener: Try and protect actors against "bad" events

---
 mopidy/core/listener.py  | 3 ++-
 mopidy/listener.py       | 6 +++++-
 mopidy/mpd/dispatcher.py | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mopidy/core/listener.py b/mopidy/core/listener.py
index 8feb0324..b8ef734d 100644
--- a/mopidy/core/listener.py
+++ b/mopidy/core/listener.py
@@ -31,7 +31,8 @@ class CoreListener(listener.Listener):
         :type event: string
         :param kwargs: any other arguments to the specific event handlers
         """
-        getattr(self, event)(**kwargs)
+        # Just delegate to parent, entry mostly for docs.
+        super(CoreListener, self).on_event(event, **kwargs)
 
     def track_playback_paused(self, tl_track, time_position):
         """
diff --git a/mopidy/listener.py b/mopidy/listener.py
index 9bcab0e0..b4ea5ec3 100644
--- a/mopidy/listener.py
+++ b/mopidy/listener.py
@@ -41,4 +41,8 @@ class Listener(object):
         :type event: string
         :param kwargs: any other arguments to the specific event handlers
         """
-        getattr(self, event)(**kwargs)
+        try:
+            getattr(self, event)(**kwargs)
+        except Exception:
+            # Ensure we don't crash the actor due to "bad" events.
+            logger.exception('Triggering event failed: %s', event)
diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py
index 099a2f18..175d8b32 100644
--- a/mopidy/mpd/dispatcher.py
+++ b/mopidy/mpd/dispatcher.py
@@ -47,6 +47,7 @@ class MpdDispatcher(object):
         return self._call_next_filter(request, response, filter_chain)
 
     def handle_idle(self, subsystem):
+        # TODO: validate against mopidy/mpd/protocol/status.SUBSYSTEMS
         self.context.events.add(subsystem)
 
         subsystems = self.context.subscriptions.intersection(