IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-09-03 20:52:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only update the list of running services in the installer or ipactl.

Browse Source 
The file is only present in the case of a server installation.

It should only be touched by the server installer and ipactl.

https://fedorahosted.org/freeipa/ticket/3277
This commit is contained in:
Rob Crittenden
2012-12-05 10:44:44 -05:00
parent 146da1b326
commit 62e7053a12
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipapython/platform/base.py
+7 -2
View File
@@ -136,12 +136,15 @@ class PlatformService(object):
def __init__(self, service_name):
self.service_name = service_name
def start(self, instance_name="", capture_output=True, wait=True):
def start(self, instance_name="", capture_output=True, wait=True,
update_service_list=True):
"""
When a service is started record the fact in a special file.
This allows ipactl stop to always stop all services that have
been started via ipa tools
"""
if not update_service_list:
return
svc_list = []
try:
f = open(SVC_LIST_FILE, 'r')
@@ -159,10 +162,12 @@ class PlatformService(object):
f.close()
return
def stop(self, instance_name="", capture_output=True):
def stop(self, instance_name="", capture_output=True, update_service_list=True):
"""
When a service is stopped remove it from the service list file.
"""
if not update_service_list:
return
svc_list = []
try:
f = open(SVC_LIST_FILE, 'r')
ipapython/platform/systemd.py
+10 -2
View File
@@ -91,13 +91,21 @@ class SystemdService(base.PlatformService):
def stop(self, instance_name="", capture_output=True):
ipautil.run(["/bin/systemctl", "stop", self.service_instance(instance_name)], capture_output=capture_output)
super(SystemdService, self).stop(instance_name)
if 'context' in api.env and api.env.context in ['ipactl', 'installer']:
update_service_list = True
else:
update_service_list = False
super(SystemdService, self).stop(instance_name,update_service_list=update_service_list)
def start(self, instance_name="", capture_output=True, wait=True):
ipautil.run(["/bin/systemctl", "start", self.service_instance(instance_name)], capture_output=capture_output)
if 'context' in api.env and api.env.context in ['ipactl', 'installer']:
update_service_list = True
else:
update_service_list = False
if wait and self.is_running(instance_name):
self.__wait_for_open_ports(self.service_instance(instance_name))
super(SystemdService, self).start(instance_name)
super(SystemdService, self).start(instance_name, update_service_list=update_service_list)
def restart(self, instance_name="", capture_output=True, wait=True):
# Restart command is broken before systemd-36-3.fc16