Skip to content

Commit cf5312c

Browse files
committed
Merge branch 'python' of github.com:rtCamp/easyengine into python
2 parents 14ec8c9 + 51f47ce commit cf5312c

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

ee/cli/plugins/debug.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def debug_nginx(self):
103103
self.trigger_nginx = True
104104

105105
else:
106-
Log.info(self, "Debug for site allready enabled")
106+
Log.info(self, "Nginx debug for site allready enabled")
107107

108108
self.msg = self.msg + ['{0}{1}/logs/error.log'
109109
.format(EEVariables.ee_webroot,
@@ -129,7 +129,7 @@ def debug_nginx(self):
129129

130130
else:
131131

132-
Log.info(self, "Debug for site allready disabled")
132+
Log.info(self, "Nginx debug for site allready disabled")
133133
else:
134134
Log.info(self, "{0} domain not valid"
135135
.format(self.app.pargs.site_name))
@@ -273,7 +273,7 @@ def debug_mysql(self):
273273
def debug_wp(self):
274274
"""Start/Stop WordPress debug"""
275275
if self.start and self.app.pargs.site_name:
276-
wp_config = ("{0}{1}/wp-config.php"
276+
wp_config = ("{0}/{1}/wp-config.php"
277277
.format(EEVariables.ee_webroot,
278278
self.app.pargs.site_name))
279279
webroot = "{0}{1}".format(EEVariables.ee_webroot,
@@ -301,8 +301,6 @@ def debug_wp(self):
301301
"wp-content/plugins"
302302
.format(webroot,
303303
EEVariables.ee_php_user))
304-
else:
305-
Log.info(self, "WordPress debug log already enabled")
306304

307305
self.msg = self.msg + ['{0}{1}/htdocs/wp-content'
308306
'/debug.log'
@@ -337,9 +335,6 @@ def debug_wp(self):
337335
"true);/d\" {0}".format(wp_config))
338336
else:
339337
Log.info(self, "WordPress debug all already disabled")
340-
else:
341-
Log.error(self, "{0} domain not valid"
342-
.format(self.app.pargs.site_name))
343338
else:
344339
Log.error(self, "Missing argument site name")
345340

ee/cli/plugins/stack.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ def post_pref(self, apt_packages, packages):
442442
config = configparser.ConfigParser()
443443
config.read('/etc/php5/fpm/pool.d/debug.conf')
444444
config['debug']['listen'] = '127.0.0.1:9001'
445+
config['debug']['rlimit_core'] = 'unlimited'
445446
with open('/etc/php5/fpm/pool.d/debug.conf',
446447
encoding='utf-8', mode='w') as confifile:
447448
Log.debug(self, "writting PHP5 configuration into "

0 commit comments

Comments
 (0)