From 24013a8acf37d7aaa645cc50eafb5d1af9156e0e Mon Sep 17 00:00:00 2001 From: "tgoff0@gmail.com" Date: Fri, 22 May 2015 00:56:24 +0000 Subject: [PATCH] daemon: Improve running session state change hooks. --- trunk/daemon/core/session.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/trunk/daemon/core/session.py b/trunk/daemon/core/session.py index 51fd7539..9436d4a0 100644 --- a/trunk/daemon/core/session.py +++ b/trunk/daemon/core/session.py @@ -324,12 +324,15 @@ class Session(object): self._hooks = {} def run_state_hooks(self, state): - try: - hooks = self._state_hooks[state] - for hook in hooks: + if state not in self._state_hooks: + return + for hook in self._state_hooks[state]: + try: hook(state) - except KeyError: - pass + except Exception, e: + self.warn("ERROR: exception occured when running %s state " + "hook: %s: %s" % (coreapi.state_name(state), + hook, e)) def add_state_hook(self, state, hook): try: