andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

listener: Try and protect actors against "bad" events

Browse Source 
(cherry picked from commit aa010e03e9)
This commit is contained in:
Thomas Adamcik 2015-12-04 23:38:55 +01:00 committed by Stein Magnus Jodal
parent 3d6270ad37
commit 3ff120a0e6
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mopidy/core/listener.py
View File

@ -31,7 +31,8 @@ class CoreListener(listener.Listener):
:type event: string :type event: string
:param kwargs: any other arguments to the specific event handlers :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): def track_playback_paused(self, tl_track, time_position):
""" """

6
mopidy/listener.py
View File

@ -51,4 +51,8 @@ class Listener(object):
:type event: string :type event: string
:param kwargs: any other arguments to the specific event handlers :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)

1
mopidy/mpd/dispatcher.py
View File

@ -47,6 +47,7 @@ class MpdDispatcher(object):
return self._call_next_filter(request, response, filter_chain) return self._call_next_filter(request, response, filter_chain)
def handle_idle(self, subsystem): def handle_idle(self, subsystem):
# TODO: validate against mopidy/mpd/protocol/status.SUBSYSTEMS
self.context.events.add(subsystem) self.context.events.add(subsystem)
subsystems = self.context.subscriptions.intersection( subsystems = self.context.subscriptions.intersection(