afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

defined custom core command error that defaults to printing command output as well

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-02 16:22:20 -08:00
parent 29a3496eda
commit 974559843a
15 changed files with 90 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/core/service.py
View file

@ -6,10 +6,10 @@ The CoreServices class handles configuration messages for sending
a list of available services to the GUI and for configuring individual
services.
"""
import subprocess
import time
from itertools import repeat
from core import CoreCommandError
from core import logger
from core.conf import Configurable
from core.conf import ConfigurableManager
@ -413,7 +413,7 @@ class CoreServices(ConfigurableManager):
logger.info("validating service %s using: %s", service._name, args)
try:
node.check_cmd(args)
except subprocess.CalledProcessError:
except CoreCommandError:
logger.exception("validate command failed")
status = -1
@ -444,7 +444,7 @@ class CoreServices(ConfigurableManager):
for args in service._shutdown:
try:
node.check_cmd(args)
except subprocess.CalledProcessError:
except CoreCommandError:
logger.exception("error running stop command %s", args)
# TODO: determine if its ok to just return the bad exit status
status = "-1"
@ -756,8 +756,8 @@ class CoreServices(ConfigurableManager):
for args in cmds:
try:
node.check_cmd(args)
except subprocess.CalledProcessError:
logger.exception("error starting command %s", args)
except CoreCommandError:
logger.exception("error starting command")
fail += "Start %s(%s)," % (s._name, args)
if event_type == EventTypes.PAUSE.value:
status = self.validatenodeservice(node, s, services)