[ARVADOS] updated: 045d2a52055334c7f90725e587925851f7bc326e

[Git user]

Summary of changes:
 services/nodemanager/arvnodeman/baseactor.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

       via  045d2a52055334c7f90725e587925851f7bc326e (commit)
      from  22fb8112e4a66280669cc84a44550172b5a438e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 045d2a52055334c7f90725e587925851f7bc326e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 25 16:33:49 2016 -0400

    Log watchdog exception refs #9303

diff --git a/services/nodemanager/arvnodeman/baseactor.py b/services/nodemanager/arvnodeman/baseactor.py
index 6169587..68ea97a 100644
--- a/services/nodemanager/arvnodeman/baseactor.py
+++ b/services/nodemanager/arvnodeman/baseactor.py
@@ -98,8 +98,9 @@ class WatchdogActor(pykka.ThreadingActor):
          self.actor_ref = TellableActorRef(self)
          self._later = self.actor_ref.tell_proxy()
 
-    def kill_self(self, act):
+    def kill_self(self, e, act):
         lg = getattr(self, "_logger", logging)
+        lg.critical("Watchdog exception", exc_info=e)
         lg.critical("Actor %s watchdog ping time out, killing Node Manager", act)
         os.kill(os.getpid(), signal.SIGKILL)
 
@@ -113,5 +114,5 @@ class WatchdogActor(pykka.ThreadingActor):
                 a.ping().get(self.timeout)
             time.sleep(20)
             self._later.run()
-        except:
-            self.kill_self(a)
+        except Exception as e:
+            self.kill_self(e, a)

-----------------------------------------------------------------------


hooks/post-receive
--