From: Faiyaz Ahmed Date: Tue, 15 Jul 2008 21:10:56 +0000 (+0000) Subject: Added logging. Forgot to return anything; threads would blow up since test of is_ru... X-Git-Tag: NodeManager-1.7-20~2 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=93826f1f59360e70f34381a5a66afa4fceca3412 Added logging. Forgot to return anything; threads would blow up since test of is_runing would fail. --- diff --git a/accounts.py b/accounts.py index a6dd6d2..cb41b67 100644 --- a/accounts.py +++ b/accounts.py @@ -147,7 +147,10 @@ class Worker: def stop(self): self._q.put((self._stop,)) def _stop(self): self._acct.stop() - def is_running(self): self._acct.is_running() + def is_running(self): + status = self._acct.is_running() + if not status: logger.verbose("Worker(%s): is not running" % self.name) + return status def _destroy(self, curr_class): self._acct = None diff --git a/sliver_vs.py b/sliver_vs.py index ee0b5d4..376bf93 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -188,7 +188,8 @@ class Sliver_VS(accounts.Account, vserver.VServer): logger.log('%s: stopping' % self.name) vserver.VServer.stop(self) - def is_running(self): vserver.VServer.is_running(self) + def is_running(self): + return vserver.VServer.is_running(self) def set_resources(self): disk_max = self.rspec['disk_max']