From ce037de1fb62a18a375545c5a9d261e467f91690 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Tue, 20 Jan 2015 19:48:31 +0530 Subject: [PATCH] changed messages --- ee/cli/plugins/site_functions.py | 12 ++++++------ ee/core/download.py | 2 +- ee/core/fileutils.py | 4 ++-- ee/core/services.py | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 9577cfde..aac9c479 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -32,7 +32,7 @@ def setupdomain(self, data): except Exception as e: Log.debug(self, "{0}".format(e)) Log.error(self, "\nUnable to create NGINX configuration") - Log.info(self, "[Done]") + Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") # create symbolic link for EEFileUtils.create_symlink(self, ['/etc/nginx/sites-available/{0}' @@ -59,7 +59,7 @@ def setupdomain(self, data): .format(ee_domain_name), '{0}/logs/error.log' .format(ee_site_webroot)]) - Log.info(self, "[Done]") + Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") def setupdatabase(self, data): @@ -126,7 +126,7 @@ def setupdatabase(self, data): EEMysql.execute(self, "grant all privileges on {0}.* to {1}@{2}" .format(ee_db_name, ee_db_username, ee_mysql_grant_host)) - Log.info(self, "[Done]") + Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") data['ee_db_name'] = ee_db_name data['ee_db_user'] = ee_db_username @@ -152,7 +152,7 @@ def setupwordpress(self, data): Log.info(self, "Downloading Wordpress \t\t", end='') EEFileUtils.chdir(self, '{0}/htdocs/'.format(ee_site_webroot)) EEShellExec.cmd_exec(self, "wp --allow-root core download") - Log.info(self, "[Done]") + Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") if not (data['ee_db_name'] and data['ee_db_user'] and data['ee_db_pass']): data = setupdatabase(self, data) @@ -324,7 +324,7 @@ def sitebackup(self, data): if data['currsitetype'] in ['html', 'php', 'mysql']: Log.info(self, "Backing up Webroot \t\t", end='') EEFileUtils.mvfile(self, ee_site_webroot + '/htdocs', backup_path) - Log.info(self, "[Done]") + Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") configfiles = glob.glob(ee_site_webroot + '/*-config.php') @@ -336,7 +336,7 @@ def sitebackup(self, data): EEShellExec.cmd_exec(self, "mysqldump {0} > {1}/{0}.sql" .format(ee_db_name, backup_path), errormsg="\nFailed: Backup Database") - Log.info(self, "[Done]") + Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") # move wp-config.php/ee-config.php to backup if data['currsitetype'] in ['mysql']: EEFileUtils.mvfile(self, configfiles[0], backup_path) diff --git a/ee/core/download.py b/ee/core/download.py index e12b66be..90e70544 100644 --- a/ee/core/download.py +++ b/ee/core/download.py @@ -21,7 +21,7 @@ class EEDownload(): os.makedirs(directory) Log.info(self, "Downloading {0:20}".format(pkg_name), end=' ') urllib.request.urlretrieve(url, filename) - Log.info(self, "{0}".format("[Done]")) + Log.info(self, "{0}".format("[" + Log.ENDC + "Done" + Log.OKBLUE + "]")) except urllib.error.URLError as e: Log.debug(self, "[{err}]".format(err=str(e.reason))) Log.error(self, "Unable to donwload file, {0}" diff --git a/ee/core/fileutils.py b/ee/core/fileutils.py index b0c37f98..17bab3a9 100644 --- a/ee/core/fileutils.py +++ b/ee/core/fileutils.py @@ -18,13 +18,13 @@ class EEFileUtils(): if os.path.isfile(file): Log.info(self, "Removing {0:65}".format(file), end=' ') os.remove(file) - Log.info(self, "{0}".format("[Done]")) + Log.info(self, "{0}".format("[" + Log.ENDC + "Done" + Log.OKBLUE + "]")) Log.debug(self, 'file Removed') if os.path.isdir(file): try: Log.info(self, "Removing {0:65}".format(file), end=' ') shutil.rmtree(file) - Log.info(self, "{0}".format("[Done]")) + Log.info(self, "{0}".format("[" + Log.ENDC + "Done" + Log.OKBLUE + "]")) except shutil.Error as e: Log.debug(self, "{err}".format(err=str(e.reason))) Log.error(self, 'Unable to Remove file ') diff --git a/ee/core/services.py b/ee/core/services.py index bf533e9f..6ecfded1 100644 --- a/ee/core/services.py +++ b/ee/core/services.py @@ -18,7 +18,7 @@ class EEService(): retcode = subprocess.getstatusoutput('service {0} start' .format(service_name)) if retcode[0] == 0: - Log.info(self, "[OK]") + Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]") return True else: Log.debug(self, "{0}".format(retcode[1])) @@ -35,7 +35,7 @@ class EEService(): retcode = subprocess.getstatusoutput('service {0} stop' .format(service_name)) if retcode[0] == 0: - Log.info(self, "[OK]") + Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]") return True else: Log.debug(self, "{0}".format(retcode[1])) @@ -52,7 +52,7 @@ class EEService(): retcode = subprocess.getstatusoutput('service {0} restart' .format(service_name)) if retcode[0] == 0: - Log.info(self, "[OK]") + Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]") return True else: Log.debug(self, "{0}".format(retcode[1])) @@ -75,7 +75,7 @@ class EEService(): # print(retcode[0]) # subprocess.getstatusoutput('service {0} reload' # .format(service_name)) - Log.info(self, "[OK]") + Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]") return True else: Log.debug(self, "{0}".format(retcode[1])) @@ -87,7 +87,7 @@ class EEService(): retcode = subprocess.getstatusoutput('service {0} reload' .format(service_name)) if retcode[0] == 0: - Log.info(self, "[OK]") + Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]") return True else: Log.debug(self, "{0}".format(retcode[1]))