From f506208d0d94c3eff5bf7761d2100e02049988a0 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 4 Sep 2015 23:46:33 +0300 Subject: [PATCH] silently ignore relayed events after camera removal --- motioneye/handlers.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/motioneye/handlers.py b/motioneye/handlers.py index 29393e5..9772f2b 100644 --- a/motioneye/handlers.py +++ b/motioneye/handlers.py @@ -1342,13 +1342,11 @@ class RelayEventHandler(BaseHandler): logging.debug('recevied relayed event %(event)s for thread id %(id)s' % {'event': event, 'id': thread_id}) camera_id = motionctl.thread_id_to_camera_id(thread_id) - try: - camera_config = config.get_camera(camera_id) - - except: - logging.warn('ignoring event for remote camera with id %s (probably removed)' % camera_id) + if camera_id is None: + logging.debug('ignoring event for thread id %s' % thread_id) return self.finish_json() - + + camera_config = config.get_camera(camera_id) if not utils.local_motion_camera(camera_config): logging.warn('ignoring event for non-local camera with id %s' % camera_id) return self.finish_json() -- 2.39.5