diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2012-05-24 11:23:36 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-07-02 17:08:58 -0400 |
| commit | e5b6260008a3a7132fdaef99d800406eb8872316 (patch) | |
| tree | 9981186bd06f5574570f5743cba05cd0aa9ee963 /ipaserver/install/service.py | |
| parent | 6fb802152add24aa1842f4adccf59b23850ab336 (diff) | |
| download | freeipa.git-e5b6260008a3a7132fdaef99d800406eb8872316.tar.gz freeipa.git-e5b6260008a3a7132fdaef99d800406eb8872316.tar.xz freeipa.git-e5b6260008a3a7132fdaef99d800406eb8872316.zip | |
Centralize timeout for waiting for servers to start.
All service start/restart currently go through ipapython/platform so
move the "wait for service to start" code there as well.
A dictionary of known services and ports to wait on is defined in base.py
This is referenced by the platforms by instance name to determine what
to wait for. For the case of dirsrv if we get that as a plain name
(no specific instance) it is assumed to be the main IPA service.
https://fedorahosted.org/freeipa/ticket/2375
https://fedorahosted.org/freeipa/ticket/2610
Diffstat (limited to 'ipaserver/install/service.py')
| -rw-r--r-- | ipaserver/install/service.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 5cc7ae63..5c2699e3 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -35,6 +35,8 @@ from ipapython.ipa_log_manager import * CACERT = "/etc/ipa/ca.crt" +# The service name as stored in cn=masters,cn=ipa,cn=etc. In the tuple +# the first value is the *nix service name, the second the start order. SERVICE_LIST = { 'KDC':('krb5kdc', 10), 'KPASSWD':('kadmin', 20), @@ -198,11 +200,11 @@ class Service(object): def stop(self, instance_name="", capture_output=True): self.service.stop(instance_name, capture_output=capture_output) - def start(self, instance_name="", capture_output=True): - self.service.start(instance_name, capture_output=capture_output) + def start(self, instance_name="", capture_output=True, wait=True): + self.service.start(instance_name, capture_output=capture_output, wait=wait) - def restart(self, instance_name="", capture_output=True): - self.service.restart(instance_name, capture_output=capture_output) + def restart(self, instance_name="", capture_output=True, wait=True): + self.service.restart(instance_name, capture_output=capture_output, wait=wait) def is_running(self): return self.service.is_running() |