X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/eefd474c44ed606a9b9afd64c31cc1fc30c8594a..aae58180130b21097e8d5af0e9ca7a8745247d36:/pymin/services/util.py diff --git a/pymin/services/util.py b/pymin/services/util.py index 91d28c3..b8a2ace 100644 --- a/pymin/services/util.py +++ b/pymin/services/util.py @@ -13,8 +13,8 @@ from pymin.dispatcher import Handler, handler, HandlerError, \ CommandNotFoundError from pymin.seqtools import Sequence -DEBUG = False -#DEBUG = True +#DEBUG = False +DEBUG = True __ALL__ = ('Error', 'ReturnNot0Error', 'ExecutionError', 'ItemError', 'ItemAlreadyExistsError', 'ItemNotFoundError', 'ContainerError', @@ -216,9 +216,8 @@ def get_network_devices(): d[name].addrs[from_addr] = Address(from_addr,24, peer=to_addr) except IndexError: pass - return d - + def get_peers(): p = subprocess.Popen(('ip', '-o', 'addr'), stdout=subprocess.PIPE, close_fds=True) @@ -643,10 +642,10 @@ class InitdHandler(ServiceHandler): p = subprocess.Popen(('pgrep', '-f', self._initd_name), stdout=subprocess.PIPE) pid = p.communicate()[0] - if p.wait() == 0 and len(pid) > 0: - c._service_running = True + if p.returncode == 0 and len(pid) > 0: + self._service_running = True else: - c._service_running = False + self._service_running = False class TransactionalHandler(Handler): r"""Handle command transactions providing a commit and rollback commands.