From 39110fb5f423b869e31e3853cddc61ecf7de80e1 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Tue, 14 Apr 2015 19:33:07 +0530 Subject: [PATCH 1/4] access db info from ee db instead of config files --- ee/cli/plugins/site.py | 45 +++++++++++++++++--------------- ee/cli/plugins/site_functions.py | 14 +++++----- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index ab517b78..e84a8450 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -326,7 +326,7 @@ class EESiteCreateController(CementBaseController): if not ee_domain.strip(): Log.error("Invalid domain name, " "Provide valid domain name") - + ee_site_webroot = EEVariables.ee_webroot + ee_domain if check_domain_exists(self, ee_domain): @@ -756,7 +756,10 @@ class EESiteUpdateController(CementBaseController): .format(ee_domain)) ee_auth = site_package_check(self, stype) - + data['ee_db_name'] = check_site.db_name + data['ee_db_user'] = check_site.db_user + data['ee_db_pass'] = check_site.db_password + data['ee_db_host'] = check_site.db_host try: sitebackup(self, data) except Exception as e: @@ -809,25 +812,25 @@ class EESiteUpdateController(CementBaseController): Log.error(self, "Update site failed. Check logs for reason " "`tail /var/log/ee/ee.log` & Try Again!!!") - if oldsitetype == 'mysql': - config_file = (ee_site_webroot + '/backup/{0}/ee-config.php' - .format(EEVariables.ee_date)) - data['ee_db_name'] = (EEFileUtils.grep(self, config_file, - 'DB_NAME') - .split(',')[1] - .split(')')[0].strip()) - data['ee_db_user'] = (EEFileUtils.grep(self, config_file, - 'DB_USER') - .split(',')[1] - .split(')')[0].strip()) - data['ee_db_pass'] = (EEFileUtils.grep(self, config_file, - 'DB_PASSWORD') - .split(',')[1] - .split(')')[0].strip()) - data['ee_db_host'] = (EEFileUtils.grep(self, config_file, - 'DB_HOST') - .split(',')[1] - .split(')')[0].strip()) + # if oldsitetype == 'mysql': + # # config_file = (ee_site_webroot + '/backup/{0}/ee-config.php' + # # .format(EEVariables.ee_date)) + # # data['ee_db_name'] = (EEFileUtils.grep(self, config_file, + # # 'DB_NAME') + # # .split(',')[1] + # # .split(')')[0].strip()) + # # data['ee_db_user'] = (EEFileUtils.grep(self, config_file, + # # 'DB_USER') + # # .split(',')[1] + # # .split(')')[0].strip()) + # # data['ee_db_pass'] = (EEFileUtils.grep(self, config_file, + # # 'DB_PASSWORD') + # # .split(',')[1] + # # .split(')')[0].strip()) + # # data['ee_db_host'] = (EEFileUtils.grep(self, config_file, + # # 'DB_HOST') + # # .split(',')[1] + # # .split(')')[0].strip()) # Setup WordPress if old sites are html/php/mysql sites if data['wp'] and oldsitetype in ['html', 'php', 'mysql']: diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index d1b0a1a1..9eaa248e 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -486,6 +486,7 @@ def setwebrootpermissions(self, webroot): def sitebackup(self, data): + print(data['ee_db_name']) ee_site_webroot = data['webroot'] backup_path = ee_site_webroot + '/backup/{0}'.format(EEVariables.ee_date) if not EEFileUtils.isexist(self, backup_path): @@ -500,15 +501,16 @@ def sitebackup(self, data): Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") configfiles = glob.glob(ee_site_webroot + '/*-config.php') - - if configfiles and EEFileUtils.isexist(self, configfiles[0]): - ee_db_name = (EEFileUtils.grep(self, configfiles[0], - 'DB_NAME').split(',')[1] - .split(')')[0].strip().replace('\'', '')) + # if configfiles and EEFileUtils.isexist(self, configfiles[0]): + # ee_db_name = (EEFileUtils.grep(self, configfiles[0], + # 'DB_NAME').split(',')[1] + # .split(')')[0].strip().replace('\'', '')) + if data['ee_db_name']: Log.info(self, 'Backing up database \t\t', end='') try: if not EEShellExec.cmd_exec(self, "mysqldump {0} > {1}/{0}.sql" - .format(ee_db_name, backup_path)): + .format(data['ee_db_name'], + backup_path)): Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]") raise SiteError("mysqldump failed to backup database") From 5c1075d8471e343f196899d941fd098cc2af61ef Mon Sep 17 00:00:00 2001 From: gau1991 Date: Tue, 14 Apr 2015 19:44:21 +0530 Subject: [PATCH 2/4] Now ee arguments goes to ee log --- ee/cli/main.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ee/cli/main.py b/ee/cli/main.py index f3b89d88..cd72f0d1 100644 --- a/ee/cli/main.py +++ b/ee/cli/main.py @@ -30,6 +30,7 @@ defaults['ee']['plugin_dir'] = '/var/lib/ee/plugins' # External templates (generally, do not ship with application code) defaults['ee']['template_dir'] = '/var/lib/ee/templates' + class EEArgHandler(ArgParseArgumentHandler): class Meta: label = 'ee_args_handler' @@ -80,6 +81,7 @@ app = EEApp() def main(): try: + global sys # Default our exit status to 0 (non-error) code = 0 @@ -91,6 +93,9 @@ def main(): # Setup the application app.setup() + # Dump all arguments into ee log + app.log.debug(sys.argv) + # Run the application app.run() except exc.EEError as e: From 5758922098996e5eb7f61012aa1d48956cebab34 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Tue, 14 Apr 2015 19:46:06 +0530 Subject: [PATCH 3/4] minor update --- ee/cli/plugins/site_functions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 9eaa248e..64e07776 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -486,7 +486,6 @@ def setwebrootpermissions(self, webroot): def sitebackup(self, data): - print(data['ee_db_name']) ee_site_webroot = data['webroot'] backup_path = ee_site_webroot + '/backup/{0}'.format(EEVariables.ee_date) if not EEFileUtils.isexist(self, backup_path): From ba4adadf0c7fed141ae7a0a53009cf8e827d66d1 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Tue, 14 Apr 2015 19:56:09 +0530 Subject: [PATCH 4/4] Fixed: Where --pagespeed clearing both hhvm and fastcgi cache --- ee/cli/plugins/clean.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ee/cli/plugins/clean.py b/ee/cli/plugins/clean.py index 63bd44fe..eb7d03b8 100644 --- a/ee/cli/plugins/clean.py +++ b/ee/cli/plugins/clean.py @@ -38,7 +38,8 @@ class EECleanController(CementBaseController): @expose(hide=True) def default(self): if (not (self.app.pargs.all or self.app.pargs.fastcgi or - self.app.pargs.memcache or self.app.pargs.opcache)): + self.app.pargs.memcache or self.app.pargs.opcache or + self.app.pargs.pagespeed)): self.clean_fastcgi() if self.app.pargs.all: self.clean_memcache()