summaryrefslogtreecommitdiffstats
path: root/ipaplatform/base
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2016-05-26 15:24:15 +0200
committerMartin Basti <mbasti@redhat.com>2016-06-15 18:11:28 +0200
commitfb4e19713d509a0a14acb7eee37f5fee7a9fb375 (patch)
tree90b76b4cca29ebc257de9aa6fcb7d14f3317d40f /ipaplatform/base
parent01795fca831ca5ce59a56755d261cb3100d6c3d4 (diff)
downloadfreeipa-fb4e19713d509a0a14acb7eee37f5fee7a9fb375.tar.gz
freeipa-fb4e19713d509a0a14acb7eee37f5fee7a9fb375.tar.xz
freeipa-fb4e19713d509a0a14acb7eee37f5fee7a9fb375.zip
Fixes CA always being presented as running
Even after manually stopping the pki-tomcatd service instance the service's is_running() method would still return True. https://fedorahosted.org/freeipa/ticket/5898 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaplatform/base')
-rw-r--r--ipaplatform/base/services.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaplatform/base/services.py b/ipaplatform/base/services.py
index 641a65418..a36b2f4ff 100644
--- a/ipaplatform/base/services.py
+++ b/ipaplatform/base/services.py
@@ -148,7 +148,7 @@ class PlatformService(object):
def restart(self, instance_name="", capture_output=True, wait=True):
return
- def is_running(self, instance_name=""):
+ def is_running(self, instance_name="", wait=True):
return False
def is_installed(self):
@@ -303,7 +303,7 @@ class SystemdService(PlatformService):
if wait and self.is_running(instance_name):
self.wait_for_open_ports(self.service_instance(instance_name))
- def is_running(self, instance_name=""):
+ def is_running(self, instance_name="", wait=True):
instance = self.service_instance(instance_name, 'is-active')
while True: