From 6008ea40ee6b96c037df7cc69bb3397054dc1dda Mon Sep 17 00:00:00 2001 From: James Tanner Date: Tue, 12 Nov 2013 00:02:30 -0500 Subject: [PATCH] Add more error detail to the service module for FreeBSD --- library/system/service | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/system/service b/library/system/service index 0173031c94..aac7319d75 100644 --- a/library/system/service +++ b/library/system/service @@ -790,9 +790,11 @@ class FreeBsdService(Service): self.rcconf_file = rcfile rc, stdout, stderr = self.execute_command("%s %s %s %s" % (self.svc_cmd, self.name, 'rcvar', self.arguments)) + cmd = "%s %s %s %s" % (self.svc_cmd, self.name, 'rcvar', self.arguments) rcvars = shlex.split(stdout, comments=True) + if not rcvars: - self.module.fail_json(msg="unable to determine rcvar") + self.module.fail_json(msg="unable to determine rcvar", stdout=stdout, stderr=stderr) # In rare cases, i.e. sendmail, rcvar can return several key=value pairs # Usually there is just one, however. In other rare cases, i.e. uwsgi, @@ -805,7 +807,7 @@ class FreeBsdService(Service): break if self.rcconf_key is None: - self.module.fail_json(msg="unable to determine rcvar") + self.module.fail_json(msg="unable to determine rcvar", stdout=stdout, stderr=stderr) return self.service_enable_rcconf()