diff options
| author | Simo Sorce <ssorce@redhat.com> | 2012-10-22 20:48:25 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-11-01 10:58:19 -0400 |
| commit | 1ef651e7f9f5f940051dc470385aa08eefcd60af (patch) | |
| tree | ff426b99e2c934073ee78f6250849976f27fc6b8 /ipapython/platform | |
| parent | 09dbc1f36bbc14c1224e45778cbc59586dfeea75 (diff) | |
| download | freeipa-1ef651e7f9f5f940051dc470385aa08eefcd60af.tar.gz freeipa-1ef651e7f9f5f940051dc470385aa08eefcd60af.tar.xz freeipa-1ef651e7f9f5f940051dc470385aa08eefcd60af.zip | |
Save service name on service startup
This is done as a default action of the ancestor class so that no matter what
platform is currently used this code is always the same and the name is the
wellknown service name.
This information will be used by ipacl to stop only and all the services that
have been started by any ipa tool/install script
Diffstat (limited to 'ipapython/platform')
| -rw-r--r-- | ipapython/platform/base.py | 23 | ||||
| -rw-r--r-- | ipapython/platform/redhat.py | 1 | ||||
| -rw-r--r-- | ipapython/platform/systemd.py | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/ipapython/platform/base.py b/ipapython/platform/base.py index 2d39d2169..1101b5cdc 100644 --- a/ipapython/platform/base.py +++ b/ipapython/platform/base.py @@ -17,6 +17,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from ipalib.plugable import MagicDict +import json +import os # Canonical names of services as IPA wants to see them. As we need to have # *some* naming, set them as in Red Hat distributions. Actual implementation @@ -40,6 +42,8 @@ wellknownports = { 'pki-tomcatd': [8080, 8443], # used if the incoming instance name is blank } +SVC_LIST_FILE = "/var/run/ipa/services.list" + class AuthConfig(object): """ AuthConfig class implements system-independent interface to configure @@ -133,6 +137,25 @@ class PlatformService(object): self.service_name = service_name def start(self, instance_name="", capture_output=True, wait=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 + """ + svc_list = [] + try: + f = open(SVC_LIST_FILE, 'r') + svc_list = json.load(f) + except Exception: + # not fatal, may be the first service + pass + + svc_list.append(self.service_name) + + f = open(SVC_LIST_FILE, 'w') + json.dump(svc_list, f) + f.flush() + f.close() return def stop(self, instance_name="", capture_output=True): diff --git a/ipapython/platform/redhat.py b/ipapython/platform/redhat.py index 3551c2841..cd1277733 100644 --- a/ipapython/platform/redhat.py +++ b/ipapython/platform/redhat.py @@ -71,6 +71,7 @@ class RedHatService(base.PlatformService): ipautil.run(["/sbin/service", self.service_name, "start", instance_name], capture_output=capture_output) if wait and self.is_running(instance_name): self.__wait_for_open_ports(instance_name) + super(RedHatService, self).start(instance_name) def restart(self, instance_name="", capture_output=True, wait=True): ipautil.run(["/sbin/service", self.service_name, "restart", instance_name], capture_output=capture_output) diff --git a/ipapython/platform/systemd.py b/ipapython/platform/systemd.py index 6c25a79b6..634140583 100644 --- a/ipapython/platform/systemd.py +++ b/ipapython/platform/systemd.py @@ -96,6 +96,7 @@ class SystemdService(base.PlatformService): ipautil.run(["/bin/systemctl", "start", self.service_instance(instance_name)], capture_output=capture_output) if wait and self.is_running(instance_name): self.__wait_for_open_ports(self.service_instance(instance_name)) + super(SystemdService, self).start(instance_name) def restart(self, instance_name="", capture_output=True, wait=True): # Restart command is broken before systemd-36-3.fc16 |