Skip to content

Commit 2fae8e6

Browse files
author
gau1991
committed
Improved logic for stack restart/reload/stop/start
1 parent 76d0bab commit 2fae8e6

File tree

1 file changed

+24
-20
lines changed

1 file changed

+24
-20
lines changed

ee/cli/plugins/stack_services.py

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ class Meta:
2323
def start(self):
2424
"""Start services"""
2525
services = []
26-
if not (self.app.pargs.nginx and self.app.pargs.php
27-
and self.app.pargs.mysql and self.app.pargs.postfix
28-
and self.app.pargs.hhvm and self.app.pargs.memcache
29-
and self.app.pargs.dovecot):
26+
if not (self.app.pargs.nginx or self.app.pargs.php
27+
or self.app.pargs.mysql or self.app.pargs.postfix
28+
or self.app.pargs.hhvm or self.app.pargs.memcache
29+
or self.app.pargs.dovecot):
3030
self.app.pargs.nginx = True
3131
self.app.pargs.php = True
3232
self.app.pargs.mysql = True
3333
self.app.pargs.postfix = True
34+
self.app.pargs.hhvm = True
3435

3536
if self.app.pargs.nginx:
3637
if EEVariables.ee_platform_distro == 'debian':
@@ -86,14 +87,15 @@ def start(self):
8687
def stop(self):
8788
"""Stop services"""
8889
services = []
89-
if not (self.app.pargs.nginx and self.app.pargs.php
90-
and self.app.pargs.mysql and self.app.pargs.postfix
91-
and self.app.pargs.hhvm and self.app.pargs.memcache
92-
and self.app.pargs.dovecot):
90+
if not (self.app.pargs.nginx or self.app.pargs.php
91+
or self.app.pargs.mysql or self.app.pargs.postfix
92+
or self.app.pargs.hhvm or self.app.pargs.memcache
93+
or self.app.pargs.dovecot):
9394
self.app.pargs.nginx = True
9495
self.app.pargs.php = True
9596
self.app.pargs.mysql = True
9697
self.app.pargs.postfix = True
98+
self.app.pargs.hhvm = True
9799

98100
if self.app.pargs.nginx:
99101
if EEVariables.ee_platform_distro == 'debian':
@@ -149,14 +151,15 @@ def stop(self):
149151
def restart(self):
150152
"""Restart services"""
151153
services = []
152-
if not (self.app.pargs.nginx and self.app.pargs.php
153-
and self.app.pargs.mysql and self.app.pargs.postfix
154-
and self.app.pargs.hhvm and self.app.pargs.memcache
155-
and self.app.pargs.dovecot):
154+
if not (self.app.pargs.nginx or self.app.pargs.php
155+
or self.app.pargs.mysql or self.app.pargs.postfix
156+
or self.app.pargs.hhvm or self.app.pargs.memcache
157+
or self.app.pargs.dovecot):
156158
self.app.pargs.nginx = True
157159
self.app.pargs.php = True
158160
self.app.pargs.mysql = True
159161
self.app.pargs.postfix = True
162+
self.app.pargs.hhvm = True
160163

161164
if self.app.pargs.nginx:
162165
if EEVariables.ee_platform_distro == 'debian':
@@ -212,14 +215,15 @@ def restart(self):
212215
def status(self):
213216
"""Status of services"""
214217
services = []
215-
if not (self.app.pargs.nginx and self.app.pargs.php
216-
and self.app.pargs.mysql and self.app.pargs.postfix
217-
and self.app.pargs.hhvm and self.app.pargs.memcache
218-
and self.app.pargs.dovecot):
218+
if not (self.app.pargs.nginx or self.app.pargs.php
219+
or self.app.pargs.mysql or self.app.pargs.postfix
220+
or self.app.pargs.hhvm or self.app.pargs.memcache
221+
or self.app.pargs.dovecot):
219222
self.app.pargs.nginx = True
220223
self.app.pargs.php = True
221224
self.app.pargs.mysql = True
222225
self.app.pargs.postfix = True
226+
self.app.pargs.hhvm = True
223227

224228
if self.app.pargs.nginx:
225229
if EEVariables.ee_platform_distro == 'debian':
@@ -275,10 +279,10 @@ def status(self):
275279
def reload(self):
276280
"""Reload service"""
277281
services = []
278-
if not (self.app.pargs.nginx and self.app.pargs.php
279-
and self.app.pargs.mysql and self.app.pargs.postfix
280-
and self.app.pargs.hhvm and self.app.pargs.memcache
281-
and self.app.pargs.dovecot):
282+
if not (self.app.pargs.nginx or self.app.pargs.php
283+
or self.app.pargs.mysql or self.app.pargs.postfix
284+
or self.app.pargs.hhvm or self.app.pargs.memcache
285+
or self.app.pargs.dovecot):
282286
self.app.pargs.nginx = True
283287
self.app.pargs.php = True
284288
self.app.pargs.mysql = True

0 commit comments

Comments
 (0)