Skip to content

Commit 6970efd

Browse files
author
shital.rtcamp
committed
removed hardcoded value from import_slow_log.py ,stack.py and debug.py file and added doc string in clean.py,secure.py
1 parent 9cbf2eb commit 6970efd

File tree

6 files changed

+276
-156
lines changed

6 files changed

+276
-156
lines changed

‎docs/ee.8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH ee 8 "EasyEngine (ee) version: 3.0" "Feb 2,2015" "EasyEngine"
1+
.TH ee 8 "EasyEngine (ee) version: 3.0" "Feb 2,2014" "EasyEngine"
22
.SH NAME
33
.B EasyEngine (ee)
44
\- Manage Nginx Based Websites.

‎ee/cli/plugins/clean.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def default(self):
5050

5151
@expose(hide=True)
5252
def clean_memcache(self):
53+
"""This function Clears memcache"""
5354
try:
5455
if(EEAptGet.is_installed(self, "memcached")):
5556
EEService.restart_service(self, "memcached")
@@ -62,6 +63,7 @@ def clean_memcache(self):
6263

6364
@expose(hide=True)
6465
def clean_fastcgi(self):
66+
"""This function clears Fastcgi cache"""
6567
if(os.path.isdir("/var/run/nginx-cache")):
6668
Log.info(self, "Cleaning NGINX FastCGI cache")
6769
EEShellExec.cmd_exec(self, "rm -rf /var/run/nginx-cache/*")
@@ -70,6 +72,7 @@ def clean_fastcgi(self):
7072

7173
@expose(hide=True)
7274
def clean_opcache(self):
75+
"""This function clears opcache"""
7376
try:
7477
Log.info(self, "Cleaning opcache")
7578
wp = urllib.request.urlopen(" https://127.0.0.1:22222/cache"

‎ee/cli/plugins/debug.py‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from ee.core.services import EEService
88
from ee.core.logging import Log
99
from ee.cli.plugins.site_functions import logwatch
10+
from ee.core.variables import EEVariables
1011
import os
1112
import configparser
1213
import glob
@@ -102,8 +103,9 @@ def debug_nginx(self):
102103
else:
103104
Log.info(self, "Debug for site allready enabled")
104105

105-
self.msg = self.msg + ['/var/www/{0}/logs/error.log'
106-
.format(self.app.pargs.site_name)]
106+
self.msg = self.msg + ['{0}{1}/logs/error.log'
107+
.format(EEVariables.ee_webroot,
108+
self.app.pargs.site_name)]
107109

108110
else:
109111
Log.info(self, "{0} domain not valid"
@@ -261,9 +263,11 @@ def debug_mysql(self):
261263
@expose(hide=True)
262264
def debug_wp(self):
263265
if self.start and self.app.pargs.site_name:
264-
wp_config = ("/var/www/{0}/wp-config.php"
265-
.format(self.app.pargs.site_name))
266-
webroot = "/var/www/{0}".format(self.app.pargs.site_name)
266+
wp_config = ("{0}{1}/wp-config.php"
267+
.format(EEVariables.ee_webroot,
268+
self.app.pargs.site_name))
269+
webroot = "{0}{1}".format(EEVariables.ee_webroot,
270+
self.app.pargs.site_name)
267271
if os.path.isfile(wp_config):
268272
if not EEShellExec.cmd_exec(self, "grep \"\'WP_DEBUG\'\" {0} |"
269273
" grep true".format(wp_config)):
@@ -287,18 +291,21 @@ def debug_wp(self):
287291
else:
288292
Log.info(self, "WordPress debug log already enabled")
289293

290-
self.msg = self.msg + ['/var/www/{0}/htdocs/wp-content'
294+
self.msg = self.msg + ['{0}{1}/htdocs/wp-content'
291295
'/debug.log'
292-
.format(self.app.pargs.site_name)]
296+
.format(EEVariables.ee_webroot,
297+
self.app.pargs.site_name)]
293298

294299
else:
295300
Log.info(self, "{0} domain not valid"
296301
.format(self.app.pargs.site_name))
297302

298303
elif not self.start and self.app.pargs.site_name:
299-
wp_config = ("/var/www/{0}/wp-config.php"
300-
.format(self.app.pargs.site_name))
301-
webroot = "/var/www/{0}".format(self.app.pargs.site_name)
304+
wp_config = ("{0}{1}/wp-config.php"
305+
.format(EEVariables.ee_webroot,
306+
self.app.pargs.site_name))
307+
webroot = "{0}{1}".format(EEVariables.ee_webroot,
308+
self.app.pargs.site_name)
302309
if os.path.isfile(wp_config):
303310
if EEShellExec.cmd_exec(self, "grep \"\'WP_DEBUG\'\" {0} | "
304311
"grep true".format(wp_config)):
@@ -365,10 +372,12 @@ def debug_rewrite(self):
365372
Log.info(self, "Nginx rewrite logs for {0} allready setup"
366373
.format(self.app.pargs.site_name))
367374

368-
if ('/var/www/{0}/logs/error.log'.format(self.app.pargs.site_name)
375+
if ('{0}{1}/logs/error.log'.format(EEVariables.ee_webroot,
376+
self.app.pargs.site_name)
369377
not in self.msg):
370-
self.msg = self.msg + ['/var/www/{0}/logs/error.log'
371-
.format(self.app.pargs.site_name)]
378+
self.msg = self.msg + ['{0}{1}/logs/error.log'
379+
.format(EEVariables.ee_webroot,
380+
self.app.pargs.site_name)]
372381

373382
# Stop Nginx rewrite for site
374383
elif not self.start and self.app.pargs.site_name:

‎ee/cli/plugins/import_slow_log.py‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from cement.core import handler, hook
33
from ee.core.shellexec import EEShellExec
44
from ee.core.logging import Log
5+
from ee.core.variables import EEVariables
56
import os
67

78

@@ -18,20 +19,25 @@ class Meta:
1819

1920
@expose(hide=True)
2021
def default(self):
21-
if os.path.isdir("/var/www/22222/htdocs/db/anemometer"):
22+
if os.path.isdir("{0}22222/htdocs/db/anemometer"
23+
.format(EEVariables.ee_webroot)):
2224
if os.path.isfile("/var/log/mysql/mysql-slow.log"):
2325
# Get Anemometer user name and password
2426
Log.error(self, "Importing MySQL slow log to Anemometer")
25-
host = os.popen("grep -e \"\'host\'\" /var/www/22222/htdocs/"
26-
"db/anemometer/conf/config.inc.php "
27+
host = os.popen("grep -e \"\'host\'\" {0}22222/htdocs/"
28+
.format(EEVariables.ee_webroot)
29+
+ "db/anemometer/conf/config.inc.php "
2730
"| head -1 | cut -d\\\' -f4 | "
2831
"tr -d '\n'").read()
29-
user = os.popen("grep -e \"\'user\'\" /var/www/22222/htdocs/"
30-
"db/anemometer/conf/config.inc.php "
32+
user = os.popen("grep -e \"\'user\'\" {0}22222/htdocs/"
33+
.format(EEVariables.ee_webroot)
34+
+ "db/anemometer/conf/config.inc.php "
3135
"| head -1 | cut -d\\\' -f4 | "
3236
"tr -d '\n'").read()
33-
password = os.popen("grep -e \"\'password\'\" /var/www/22222/"
34-
"htdocs/db/anemometer/conf/config.inc.php "
37+
password = os.popen("grep -e \"\'password\'\" {0}22222/"
38+
.format(EEVariables.ee_webroot)
39+
+ "htdocs/db/anemometer/conf"
40+
"/config.inc.php "
3541
"| head -1 | cut -d\\\' -f4 | "
3642
"tr -d '\n'").read()
3743

‎ee/cli/plugins/secure.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def default(self):
4444

4545
@expose(hide=True)
4646
def secure_auth(self):
47+
"""This function Secures authentication"""
4748
passwd = ''.join([random.choice
4849
(string.ascii_letters + string.digits)
4950
for n in range(6)])
@@ -74,6 +75,7 @@ def secure_auth(self):
7475

7576
@expose(hide=True)
7677
def secure_port(self):
78+
"""This function Secures port"""
7779
while not self.app.pargs.user_input.isdigit():
7880
Log.info(self, "Please Enter valid port number ")
7981
self.app.pargs.user_input = input("EasyEngine admin port [22222]:")
@@ -100,6 +102,7 @@ def secure_port(self):
100102

101103
@expose(hide=True)
102104
def secure_ip(self):
105+
"""This function Secures IP"""
103106
# TODO:remaining with ee.conf updation in file
104107
newlist = []
105108
if not self.app.pargs.user_input:

0 commit comments

Comments
 (0)