External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 08:18:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Make the service scanner more closely match the package scanner output

Browse Source
This commit is contained in:
Matthew Jones
2015-03-25 13:23:55 -04:00
parent 5f66fbb7c4
commit 4252845b0d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/plugins/library/scan_services.py
View File

@@ -11,7 +11,7 @@ class BaseService(object):
class ServiceScanService(BaseService): class ServiceScanService(BaseService):
def gather_services(self): def gather_services(self):
services = {} services = []
service_path = self.module.get_bin_path("service") service_path = self.module.get_bin_path("service")
if service_path is None: if service_path is None:
return None return None
@@ -26,7 +26,7 @@ class ServiceScanService(BaseService):
continue # Skipping because we expected more data continue # Skipping because we expected more data
service_name = " ".join(line_data[3:]) service_name = " ".join(line_data[3:])
service_state = "running" if line_data[1] == "+" else "stopped" service_state = "running" if line_data[1] == "+" else "stopped"
services[service_name] = {"name": service_name, "state": service_state, "source": "sysv"} services.append({"name": service_name, "state": service_state, "source": "sysv"})
rc, stdout, stderr = self.module.run_command("%s list" % initctl_path) rc, stdout, stderr = self.module.run_command("%s list" % initctl_path)
real_stdout = stdout.replace("\r","") real_stdout = stdout.replace("\r","")
for line in real_stdout.split("\n"): for line in real_stdout.split("\n"):
@@ -46,7 +46,7 @@ class ServiceScanService(BaseService):
else: else:
pid = None pid = None
payload = {"name": service_name, "state": service_state, "goal": service_goal, "source": "upstart"} payload = {"name": service_name, "state": service_state, "goal": service_goal, "source": "upstart"}
services[service_name] = payload services.append(payload)
# RH sysvinit # RH sysvinit
elif chkconfig_path is not None: elif chkconfig_path is not None:
@@ -69,7 +69,7 @@ class ServiceScanService(BaseService):
else: else:
continue continue
service_data = {"name": service_name, "state": service_state, "source": "sysv"} service_data = {"name": service_name, "state": service_state, "source": "sysv"}
services[service_name] = service_data services.append(service_data)
# rc, stdout, stderr = self.module.run_command("%s --list" % chkconfig_path) # rc, stdout, stderr = self.module.run_command("%s --list" % chkconfig_path)
# Do something with chkconfig status # Do something with chkconfig status
return services return services
@@ -89,7 +89,7 @@ class SystemctlScanService(BaseService):
return False return False
def gather_services(self): def gather_services(self):
services = {} services = []
if not self.systemd_enabled(): if not self.systemd_enabled():
return None return None
systemctl_path = self.module.get_bin_path("systemctl", opt_dirs=["/usr/bin", "/usr/local/bin"]) systemctl_path = self.module.get_bin_path("systemctl", opt_dirs=["/usr/bin", "/usr/local/bin"])
@@ -100,20 +100,20 @@ class SystemctlScanService(BaseService):
line_data = line.split() line_data = line.split()
if len(line_data) != 2: if len(line_data) != 2:
continue continue
services[line_data[0]] = {"name": line_data[0], services.append({"name": line_data[0],
"state": "running" if line_data[1] == "enabled" else "stopped", "state": "running" if line_data[1] == "enabled" else "stopped",
"source": "systemd"} "source": "systemd"})
return services return services
def main(): def main():
module = AnsibleModule(argument_spec = dict()) module = AnsibleModule(argument_spec = dict())
service_modules = (ServiceScanService, SystemctlScanService) service_modules = (ServiceScanService, SystemctlScanService)
all_services = {} all_services = []
for svc_module in service_modules: for svc_module in service_modules:
svcmod = svc_module(module) svcmod = svc_module(module)
svc = svcmod.gather_services() svc = svcmod.gather_services()
if svc is not None: if svc is not None:
all_services.update(svc) all_services += svc
results = dict(ansible_facts=dict(services=all_services)) results = dict(ansible_facts=dict(services=all_services))
module.exit_json(**results) module.exit_json(**results)