From f51359f5baf3fddaad71c856ee0d439d9f70efff Mon Sep 17 00:00:00 2001 From: gau1991 Date: Wed, 14 Jan 2015 16:17:01 +0530 Subject: [PATCH 1/3] Noe debug logs goes into file --- config/ee.conf | 14 +++++++------- ee/cli/controllers/base.py | 14 -------------- ee/cli/main.py | 4 ---- setup.py | 6 ++++++ 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/config/ee.conf b/config/ee.conf index 1f89eeee..d3d8aafb 100644 --- a/config/ee.conf +++ b/config/ee.conf @@ -18,25 +18,25 @@ # template_dir = /var/lib/ee/templates/ -[log] +[log.logging] ### Where the log file lives (no log file by default) -# file = none +file = /var/log/ee/ee.log ### The level for which to log. One of: info, warn, error, fatal, debug -# level = info +level = debug ### Whether or not to log to console -# to_console = true +to_console = true ### Whether or not to rotate the log file when it reaches `max_bytes` -# rotate = false +rotate = true ### Max size in bytes that a log file can grow until it is rotated. -# max_bytes = 512000 +max_bytes = 512000 ### The maximun number of log files to maintain when rotating -# max_files = 4 +max_files = 7 [stack] diff --git a/ee/cli/controllers/base.py b/ee/cli/controllers/base.py index 4ccc2869..aad1d5c5 100644 --- a/ee/cli/controllers/base.py +++ b/ee/cli/controllers/base.py @@ -31,17 +31,3 @@ class EEBaseController(CementBaseController): # # The 'default.mustache' file would be loaded from # ``ee.cli.templates``, or ``/var/lib/ee/templates/``. - # - # ViMbAdmin Nginx configuration - data = dict(site_name='webmail', www_domain='webmail', static=False, - basic=True, wp=False, w3tc=False, wpfc=False, - wpsc=False, multisite=False, wpsubdir=False, - webroot='/var/www', ee_db_name='', - ee_db_user='', ee_db_pass='', ee_db_host='', - rc=True) - self.app.log.debug('Writting the nginx configration for' - ' ViMbAdmin') - ee_rc = open('/etc/nginx/sites-available/webmail.conf', 'w') - self.app.render((data), 'virtualconf.mustache', - out=ee_rc) - ee_rc.close() diff --git a/ee/cli/main.py b/ee/cli/main.py index f5c84d76..17c8281f 100644 --- a/ee/cli/main.py +++ b/ee/cli/main.py @@ -23,10 +23,6 @@ class EEApp(foundation.CementApp): class Meta: label = 'ee' - # Log writing to file - defaults = init_defaults('ee', 'log.logging') - defaults['log.logging']['file'] = '/tmp/my.log' - config_defaults = defaults # All built-in application bootstrapping (always run) diff --git a/setup.py b/setup.py index 171d57dd..3064be7d 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,12 @@ for name in glob.glob('config/plugins.d/*.conf'): for name in glob.glob('ee/cli/templates/*.mustache'): templates.insert(1, name) +if not os.path.exists('/var/log/ee/'): + os.makedirs('/var/log/ee/') + +if not os.path.exists('/var/lib/ee/'): + os.makedirs('/var/lib/ee/') + setup(name='ee', version='3.0', description=('EasyEngine is the commandline tool to manage your Websites' From ddb21226f812e47ee3dfb51cc15ed269dd44f3dc Mon Sep 17 00:00:00 2001 From: "shital.rtcamp" Date: Wed, 14 Jan 2015 17:06:10 +0530 Subject: [PATCH 2/3] update --- ee/cli/plugins/clean.py | 14 ++++++---- ee/cli/plugins/secure.py | 6 ++-- ee/cli/plugins/stack_services.py | 2 +- ee/core/download.py | 8 +++--- ee/core/extract.py | 4 +-- ee/core/fileutils.py | 37 +++++++++++++------------ ee/core/mysql.py | 8 +++--- ee/core/services.py | 47 ++++++++++++++++---------------- ee/core/shellexec.py | 12 +++----- 9 files changed, 71 insertions(+), 67 deletions(-) diff --git a/ee/cli/plugins/clean.py b/ee/cli/plugins/clean.py index b345150c..13d3d805 100644 --- a/ee/cli/plugins/clean.py +++ b/ee/cli/plugins/clean.py @@ -53,11 +53,11 @@ class EECleanController(CementBaseController): try: if(EEAptGet.is_installed("memcached")): EEService.restart_service(self, "memcached") - Log.info(self, "Cleaning memcache..") + Log.info(self, "Cleaning memcache...") else: - Log.error(self, "Memcache not installed") + Log.error(self, "Memcache not installed{0}".format("[FAIL]")) except: - Log.error(self, "Unable to restart memcached") + Log.error(self, "Unable to restart memcached{0}".format("[FAIL]")) @expose(hide=True) def clean_fastcgi(self): @@ -65,16 +65,18 @@ class EECleanController(CementBaseController): Log.info(self, "Cleaning NGINX FastCGI cache, please wait...") EEShellExec.cmd_exec(self, "rm -rf /var/run/nginx-cache/*") else: - Log.error(self, "Unable to clean FastCGI cache") + Log.error(self, "Unable to clean FastCGI cache{0}" + .format("[FAIL]")) @expose(hide=True) def clean_opcache(self): try: - Log.info(self, "Cleaning opcache.... ") + Log.info(self, "Cleaning opcache... ") wp = urllib.request.urlopen(" https://127.0.0.1:22222/cache" "/opcache/opgui.php?page=reset").read() except Exception as e: - Log.error(self, "Unable to clean opacache {0}".format(e)) + Log.error(self, "Unable to clean opacache {0:10}{1}" + .format(e, "[FAIL]")) def load(app): diff --git a/ee/cli/plugins/secure.py b/ee/cli/plugins/secure.py index 400962f6..fc336e77 100644 --- a/ee/cli/plugins/secure.py +++ b/ee/cli/plugins/secure.py @@ -75,14 +75,16 @@ class EEsecureController(CementBaseController): "/etc/nginx/sites-available/22222" .format(port=port)) else: - Log.info(self, "Unable to change EasyEngine admin port") + Log.info(self, "Unable to change EasyEngine admin port{0}" + .format("[FAIL]")) if EEVariables.ee_platform_distro == 'Debian': EEShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen " "{port} default_server ssl;/\" " "/etc/nginx/sites-available/22222" .format(port=port)) else: - Log.info(self, "Unable to change EasyEngine admin port") + Log.info(self, "Unable to change EasyEngine admin port{0}" + .format("[FAIL]")) @expose(hide=True) def secure_ip(self): diff --git a/ee/cli/plugins/stack_services.py b/ee/cli/plugins/stack_services.py index 4f081d15..666b404e 100644 --- a/ee/cli/plugins/stack_services.py +++ b/ee/cli/plugins/stack_services.py @@ -124,4 +124,4 @@ class EEStackStatusController(CementBaseController): services = services + ['nginx', 'php5-fpm', 'mysql', 'postfix'] for service in services: if EEService.get_service_status(self, service): - Log.info(self, "{0}: Running".format(service)) + Log.info(self, "{0:10}: {1}".format(service, "Running")) diff --git a/ee/core/download.py b/ee/core/download.py index c7a22e8f..f2be973a 100644 --- a/ee/core/download.py +++ b/ee/core/download.py @@ -22,12 +22,12 @@ class EEDownload(): Log.info(self, "Downloading "+pkg_name+" ...") urllib.request.urlretrieve(url, filename) except urllib.error.URLError as e: - Log.error(self, "Unable to donwload file, [{err}] [FAIL]" - .format(err=str(e.reason))) + Log.error(self, "Unable to donwload file, [{err}]{1}" + .format("[FAIL]", err=str(e.reason))) return False except urllib.error.HTTPError as e: - Log.error(self, "Package download failed. [{err}] [FAIL]" - .format(err=str(e.reason))) + Log.error(self, "Package download failed. [{err}] {1}" + .format("[FAIL]", err=str(e.reason))) return False except urllib.error.ContentTooShortError as e: Log.error(self, "Package download failed. The amount of the" diff --git a/ee/core/extract.py b/ee/core/extract.py index 91f58d53..a25d7306 100644 --- a/ee/core/extract.py +++ b/ee/core/extract.py @@ -15,6 +15,6 @@ class EEExtract(): os.remove(file) return True except tarfile.TarError as e: - Log.error(self, 'Unable to extract file \{0} {1} [FAIL]' - .format(e.errno, e.strerror)) + Log.error(self, 'Unable to extract file \{0} {1}{2}' + .format(e.errno, e.strerror, "[FAIL]")) return False diff --git a/ee/core/fileutils.py b/ee/core/fileutils.py index 9a537878..30d52511 100644 --- a/ee/core/fileutils.py +++ b/ee/core/fileutils.py @@ -35,8 +35,8 @@ class EEFileUtils(): try: os.symlink(src, dst) except Exception as e: - Log.error(self, "Unable to create symbolic link ...\n {0}" - " {1}".format(e.errno, e.strerror)) + Log.error(self, "Unable to create symbolic link ...\n {0} " + " {1} {2}".format(e.errno, e.strerror, "[FAIL]")) sys.exit(1) else: Log.debug(self, "Destination: {0} exists".format(dst)) @@ -45,8 +45,8 @@ class EEFileUtils(): try: os.unlink(filepath) except Exception as e: - Log.error(self, "Unable to reomove symbolic link ...\n {0} {1}" - .format(e.errno, e.strerror)) + Log.error(self, "Unable to reomove symbolic link ...\n {0} {1} {2}" + .format(e.errno, e.strerror, "[FAIL]")) sys.exit(1) def copyfile(self, src, dest): @@ -69,16 +69,16 @@ class EEFileUtils(): try: shutil.move(src, dst) except shutil.Error as e: - Log.error(self, 'Unable to move file {err}' - .format(err=str(e.reason))) + Log.error(self, 'Unable to move file {err}{1}' + .format("[FAIL]", err=str(e.reason))) sys.exit(1) def chdir(self, path): try: os.chdir(path) except OSError as e: - Log.error(self, 'Unable to Change Directory {err}' - .format(err=e.strerror)) + Log.error(self, 'Unable to Change Directory {1}{err}' + .format("[FAIL]", err=e.strerror)) sys.exit(1) def chown(self, path, user, group, recursive=False): @@ -94,10 +94,12 @@ class EEFileUtils(): else: shutil.chown(path, user=user, group=group) except shutil.Error as e: - Log.error(self, "Unable to change owner : {0} ".format(e)) + Log.error(self, "Unable to change owner : {0}{1}" + .format(e, "[FAIL]")) sys.exit(1) except Exception as e: - Log.error(self, "Unable to change owner {0}".format(e)) + Log.error(self, "Unable to change owner {0}{1}" + .format(e, "[FAIL]")) sys.exit(1) def chmod(self, path, perm, recursive=False): @@ -111,15 +113,16 @@ class EEFileUtils(): else: os.chmod(path, perm) except OSError as e: - Log.error(self, "Unable to change owner {0}".format(e.strerror)) + Log.error(self, "Unable to change owner {0}{1}" + .format(e.strerror, "[FAIL]")) sys.exit(1) def mkdir(self, path): try: os.makedirs(path) except OSError as e: - Log.error(self, "Unable to create directory {0}" - .format(e.strerror)) + Log.error(self, "Unable to create directory {0}{1} " + .format(e.strerror, "[FAIL]")) sys.exit(1) def isexist(self, path): @@ -129,8 +132,8 @@ class EEFileUtils(): else: return (False) except OSError as e: - Log.error(self, "Unable to check path {0}" - .format(e.strerror)) + Log.error(self, "Unable to check path {0}{1}" + .format(e.strerror, "[FAIL]")) sys.exit(1) def grep(self, fnm, sstr): @@ -139,6 +142,6 @@ class EEFileUtils(): if sstr in line: return line except OSError as e: - Log.error(self, "Unable to Search string {0}" - .format(e.strerror)) + Log.error(self, "Unable to Search string {0}{1}" + .format(e.strerror, "[FAIL]")) sys.exit(1) diff --git a/ee/core/mysql.py b/ee/core/mysql.py index 883752f2..ff2ee15e 100644 --- a/ee/core/mysql.py +++ b/ee/core/mysql.py @@ -30,15 +30,15 @@ class EEMysql(): user=user, passwd=passwd) cur = conn.cursor() except Exception as e: - Log.error(self, 'Unable to connect to database: {0}' - .format(e)) + Log.error(self, 'Unable to connect to database: {0} {1}' + .format(e, "[FAIL]")) sys.exit(1) try: cur.execute(statement) except Exception as e: - Log.error(self, 'Error occured while executing: {0}' - .format(e)) + Log.error(self, 'Unable to execute statement: {0} {1}' + .format(e, "[FAIL]")) cur.close() conn.close() sys.exit(1) diff --git a/ee/core/services.py b/ee/core/services.py index 97cea2d3..7c5d0e71 100644 --- a/ee/core/services.py +++ b/ee/core/services.py @@ -4,6 +4,7 @@ import sys import subprocess from subprocess import Popen from ee.core.logging import Log +import pystache class EEService(): @@ -17,13 +18,13 @@ class EEService(): retcode = subprocess.getstatusoutput('service {0} start' .format(service_name)) if retcode[0] == 0: - Log.info(self, "Started : {0} [ok]" - .format(service_name)) + Log.info(self, "Started : {0:10}{1}" + .format(service_name, "[OK]")) else: Log.error(self, retcode[1]) except OSError as e: - Log.error(self, "Failed to start service {0} {1} [FAIL]" - .format(e.errno, e.strerror)) + Log.error(self, "Failed to start service {0} {1} {2}" + .format(e.errno, e.strerror, "[FAIL]")) return False def stop_service(self, service_name): @@ -31,25 +32,25 @@ class EEService(): retcode = subprocess.getstatusoutput('service {0} stop' .format(service_name)) if retcode[0] == 0: - Log.info(self, "Stopped : {0} [OK]" - .format(service_name)) + Log.info(self, "Stopped : {0:10}{1}" + .format(service_name, "[OK]")) return True else: return False except OSError as e: - Log.error(self, "Failed to stop service : {0}{1} [FAIL]" - .format(e.errno, e.strerror)) + Log.error(self, "Failed to stop service : {0}{1}{2}" + .format(e.errno, e.strerror, "[FAIL]")) return False def restart_service(self, service_name): try: EEService.stop_service(self, service_name) EEService.start_service(self, service_name) - Log.info(self, "restart : {0} [OK]" - .format(service_name)) + Log.info(self, "restart : {0:10}{1}" + .format(service_name, "[OK]")) except OSError as e: - Log.error(self, "Failed to restart services \{0} {1} [FAIL]" - .format(e.errno, e.strerror)) + Log.error(self, "Failed to restart services \{0} {1} {2}" + .format(e.errno, e.strerror, "[FAIL]")) def reload_service(self, service_name): try: @@ -59,28 +60,28 @@ class EEService(): if retcode[0] == 0: subprocess.getstatusoutput('service {0} reload' .format(service_name)) - Log.info("reload : {0} [OK]" - .format(service_name)) + Log.info(self, "reload : {0} {0:10}" + .format(service_name, "[OK]")) return True else: - Log.error("reload : {0} [FAIL]" - .format(service_name)) - Log.debug("{0}" + Log.error(self, "reload : {0} {1}" + .format(service_name, "[FAIL]")) + Log.debug(self, "{0}" .format(retcode[1])) return False retcode = subprocess.getstatusoutput('service {0} reload' .format(service_name)) if retcode[0] == 0: - Log.info(self, "reload : {0} [OK]" - .format(service_name)) + Log.info(self, "reload : {0:10}{1}" + .format(service_name, "[OK]")) return True else: return False except OSError as e: - Log.error(self, "Failed to reload {0} {1} [FAIL]" - .format(service_name, e)) + Log.error(self, "Failed to reload {0} {1} {2}" + .format(service_name, e, "[FAIL]")) sys.exit(1) def get_service_status(self, service_name): @@ -97,6 +98,6 @@ class EEService(): else: return False except OSError as e: - Log.error(self, "Unable to get services status \ {0}{1} [FAIL]" - .format(e.errno, e.strerror)) + Log.error(self, "Unable to get services status \ {0}{1}{2}" + .format(e.errno, e.strerror, "[FAIL]")) return False diff --git a/ee/core/shellexec.py b/ee/core/shellexec.py index 45130607..54c85f1f 100644 --- a/ee/core/shellexec.py +++ b/ee/core/shellexec.py @@ -24,10 +24,8 @@ class EEShellExec(): if errormsg: Log.error(self, errormsg) else: - Log.error(self, "Unable to execute command \ {0}{1}" - .format(e.errno, e.strerror)) - Log.debug(self, "Unable to execute command \ {0}{1}" - .format(e.errno, e.strerror)) + Log.error(self, "Unable to execute command \ {0}{1}{2}" + .format(e.errno, e.strerror, "[FAIL]")) sys.exit(1) def invoke_editor(self, filepath, errormsg=''): @@ -37,8 +35,6 @@ class EEShellExec(): if errormsg: Log.error(self, errormsg) else: - Log.error(self, "Unable to edit file \ {0}{1}" - .format(e.errno, e.strerror)) - Log.debug(self, "Unable to edit file \ {0}{1}" - .format(e.errno, e.strerror)) + Log.error(self, "Unable to edit file \ {0}{1}{2}" + .format(e.errno, e.strerror, "[FAIL]")) sys.exit(1) From d87ecd4f89b8f9cc5b2d4bbfacfc7758f645c2cf Mon Sep 17 00:00:00 2001 From: "shital.rtcamp" Date: Wed, 14 Jan 2015 19:50:43 +0530 Subject: [PATCH 3/3] added log message --- ee/cli/plugins/clean.py | 14 +++++------ ee/core/download.py | 14 ++++++----- ee/core/extract.py | 4 +-- ee/core/fileutils.py | 55 +++++++++++++++++++++++------------------ ee/core/git.py | 8 ++++-- ee/core/mysql.py | 8 +++--- ee/core/services.py | 28 ++++++++++++--------- ee/core/shellexec.py | 9 ++++--- 8 files changed, 79 insertions(+), 61 deletions(-) diff --git a/ee/cli/plugins/clean.py b/ee/cli/plugins/clean.py index 13d3d805..e2eb41b9 100644 --- a/ee/cli/plugins/clean.py +++ b/ee/cli/plugins/clean.py @@ -55,9 +55,10 @@ class EECleanController(CementBaseController): EEService.restart_service(self, "memcached") Log.info(self, "Cleaning memcache...") else: - Log.error(self, "Memcache not installed{0}".format("[FAIL]")) - except: - Log.error(self, "Unable to restart memcached{0}".format("[FAIL]")) + Log.error(self, "Memcache not installed") + except Exception as e: + Log.error(self, "Unable to restart memcached") + Log.debug(self, "{0}".format(e)) @expose(hide=True) def clean_fastcgi(self): @@ -65,8 +66,7 @@ class EECleanController(CementBaseController): Log.info(self, "Cleaning NGINX FastCGI cache, please wait...") EEShellExec.cmd_exec(self, "rm -rf /var/run/nginx-cache/*") else: - Log.error(self, "Unable to clean FastCGI cache{0}" - .format("[FAIL]")) + Log.error(self, "Unable to clean FastCGI cache") @expose(hide=True) def clean_opcache(self): @@ -75,8 +75,8 @@ class EECleanController(CementBaseController): wp = urllib.request.urlopen(" https://127.0.0.1:22222/cache" "/opcache/opgui.php?page=reset").read() except Exception as e: - Log.error(self, "Unable to clean opacache {0:10}{1}" - .format(e, "[FAIL]")) + Log.error(self, "Unable to clean opacache") + Log.debug(self, "{0}".format(e)) def load(app): diff --git a/ee/core/download.py b/ee/core/download.py index f2be973a..062c3451 100644 --- a/ee/core/download.py +++ b/ee/core/download.py @@ -22,16 +22,18 @@ class EEDownload(): Log.info(self, "Downloading "+pkg_name+" ...") urllib.request.urlretrieve(url, filename) except urllib.error.URLError as e: - Log.error(self, "Unable to donwload file, [{err}]{1}" - .format("[FAIL]", err=str(e.reason))) + Log.error(self, "Unable to donwload file, {0}" + .format(filename)) + Log.debug(self, "[{err}]".format(err=str(e.reason))) return False except urllib.error.HTTPError as e: - Log.error(self, "Package download failed. [{err}] {1}" - .format("[FAIL]", err=str(e.reason))) + Log.error(self, "Package download failed. {0}" + .format(pkg_name)) + Log.debug(self, "[{err}]".format(err=str(e.reason))) return False except urllib.error.ContentTooShortError as e: Log.error(self, "Package download failed. The amount of the" " downloaded data is less than " - "the expected amount \{0} {1}" - .format(e.errno, e.strerror)) + "the expected amount \{0} ".format(pkg_name)) + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) return False diff --git a/ee/core/extract.py b/ee/core/extract.py index a25d7306..3a012883 100644 --- a/ee/core/extract.py +++ b/ee/core/extract.py @@ -15,6 +15,6 @@ class EEExtract(): os.remove(file) return True except tarfile.TarError as e: - Log.error(self, 'Unable to extract file \{0} {1}{2}' - .format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, 'Unable to extract file \{0}'.format(file)) + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) return False diff --git a/ee/core/fileutils.py b/ee/core/fileutils.py index 66afde52..90f8349e 100644 --- a/ee/core/fileutils.py +++ b/ee/core/fileutils.py @@ -24,8 +24,8 @@ class EEFileUtils(): Log.info(self, "Removing "+os.path.basename(file)+"...") shutil.rmtree(file) except shutil.Error as e: - Log.error(self, 'Unable to Remove file {err}' - .format(err=str(e.reason))) + Log.error(self, 'Unable to Remove file ') + Log.debug(self, "{err}".format(err=str(e.reason))) sys.exit(1) def create_symlink(self, paths, errormsg=''): @@ -35,8 +35,8 @@ class EEFileUtils(): try: os.symlink(src, dst) except Exception as e: - Log.error(self, "Unable to create symbolic link ...\n {0} " - " {1} {2}".format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, "Unable to create symbolic link ...\n ") + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) sys.exit(1) else: Log.debug(self, "Destination: {0} exists".format(dst)) @@ -45,40 +45,47 @@ class EEFileUtils(): try: os.unlink(filepath) except Exception as e: - Log.error(self, "Unable to reomove symbolic link ...\n {0} {1} {2}" - .format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, "Unable to reomove symbolic link ...\n") + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) sys.exit(1) def copyfile(self, src, dest): try: shutil.copy2(src, dest) except shutil.Error as e: - Log.error(self, '{0}'.format(e)) + Log.error(self, 'Unable to copy file from {0} to {1}' + .format(src, dest)) + Log.debug(self, "{0}".format(e)) except IOError as e: - Log.error(self, '{e}'.format(e.strerror)) + Log.error(self, "Unable to copy file from {0} to {1}" + .fromat(src, dest)) + Log.debug(self, "{e}".format(e.strerror)) def searchreplace(self, fnm, sstr, rstr): try: for line in fileinput.input(fnm, inplace=True): - Log.info(line.replace(sstr, rstr)) + print(line.replace(sstr, rstr), end='') fileinput.close() except Exception as e: - Log.error(self, '{0}'.format(e)) + Log.error(self, "Unable to search {0} and replace {1} {2}" + .format(fnm, sstr, rstr)) + Log.debug(self, "{0}".format(e)) def mvfile(self, src, dst): try: shutil.move(src, dst) except shutil.Error as e: - Log.error(self, 'Unable to move file {err}{1}' - .format("[FAIL]", err=str(e.reason))) + Log.error(self, 'Unable to move file from {0} to {1}' + .format(src, dst)) + Log.debug(self, "{err}".format(err=str(e.reason))) sys.exit(1) def chdir(self, path): try: os.chdir(path) except OSError as e: - Log.error(self, 'Unable to Change Directory {1}{err}' - .format("[FAIL]", err=e.strerror)) + Log.error(self, 'Unable to Change Directory {0}'.format(path)) + Log.debug(self, "{err}".format(err=e.strerror)) sys.exit(1) def chown(self, path, user, group, recursive=False): @@ -94,12 +101,12 @@ class EEFileUtils(): else: shutil.chown(path, user=user, group=group) except shutil.Error as e: - Log.error(self, "Unable to change owner : {0}{1}" - .format(e, "[FAIL]")) + Log.error(self, "Unable to change owner : {0}".format(path)) + Log.debug(self, "{0}".format(e)) sys.exit(1) except Exception as e: - Log.error(self, "Unable to change owner {0}{1}" - .format(e, "[FAIL]")) + Log.error(self, "Unable to change owner : {0} ".format(path)) + Log.debug(self, "{0}".format(e)) sys.exit(1) def chmod(self, path, perm, recursive=False): @@ -113,16 +120,16 @@ class EEFileUtils(): else: os.chmod(path, perm) except OSError as e: - Log.error(self, "Unable to change owner {0}{1}" - .format(e.strerror, "[FAIL]")) + Log.error(self, "Unable to change owner : {0}".format(path)) + Log.debug(self, "{0}".format(e.strerror)) sys.exit(1) def mkdir(self, path): try: os.makedirs(path) except OSError as e: - Log.error(self, "Unable to create directory {0}{1} " - .format(e.strerror, "[FAIL]")) + Log.error(self, "Unable to create directory {0} ".format(path)) + Log.debug(self, "{0}".format(e.strerror)) sys.exit(1) def isexist(self, path): @@ -132,8 +139,8 @@ class EEFileUtils(): else: return (False) except OSError as e: - Log.error(self, "Unable to check path {0}{1}" - .format(e.strerror, "[FAIL]")) + Log.error(self, "Unable to check path {0}".format(path)) + Log.debug(self, "{0}".format(e.strerror)) sys.exit(1) def grep(self, fnm, sstr): diff --git a/ee/core/git.py b/ee/core/git.py index 659d51d0..768c3aa6 100644 --- a/ee/core/git.py +++ b/ee/core/git.py @@ -21,7 +21,9 @@ class EEGit: .format(path)) git.init(path) except ErrorReturnCode as e: - Log.error(e) + Log.error(self, "Unable to git init at {0}" + .format(path)) + Log.error(self, "{0}".format(e)) sys.exit(1) status = git.status("-s") if len(status.splitlines()) > 0: @@ -31,7 +33,9 @@ class EEGit: git.add("--all") git.commit("-am {0}".format(msg)) except ErrorReturnCode as e: - Log.error(e) + Log.error(self, "Unable to git commit at {0} " + .format(path)) + Log.debug(self, "{0}".format(e)) sys.exit(1) else: Log.debug(self, "EEGit: Path {0} not present".format(path)) diff --git a/ee/core/mysql.py b/ee/core/mysql.py index ff2ee15e..ea40453c 100644 --- a/ee/core/mysql.py +++ b/ee/core/mysql.py @@ -30,15 +30,15 @@ class EEMysql(): user=user, passwd=passwd) cur = conn.cursor() except Exception as e: - Log.error(self, 'Unable to connect to database: {0} {1}' - .format(e, "[FAIL]")) + Log.error(self, 'Unable to connect to database: ') + Log.debug(self, "{0}".format(e)) sys.exit(1) try: cur.execute(statement) except Exception as e: - Log.error(self, 'Unable to execute statement: {0} {1}' - .format(e, "[FAIL]")) + Log.error(self, 'Unable to execute statement:') + Lod.debug(self, "{0}".format(e)) cur.close() conn.close() sys.exit(1) diff --git a/ee/core/services.py b/ee/core/services.py index 445c522c..a55959eb 100644 --- a/ee/core/services.py +++ b/ee/core/services.py @@ -23,8 +23,9 @@ class EEService(): else: Log.error(self, retcode[1]) except OSError as e: - Log.error(self, "Failed to start service {0} {1} {2}" - .format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, "Failed to start service {0}" + .format(service_name)) + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) return False def stop_service(self, service_name): @@ -38,8 +39,9 @@ class EEService(): else: return False except OSError as e: - Log.error(self, "Failed to stop service : {0}{1}{2}" - .format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, "Failed to stop service : {0}" + .format(service_name)) + Log.debug(self, "{0} {1}".format(e.errno, e.strerror)) return False def restart_service(self, service_name): @@ -49,8 +51,9 @@ class EEService(): Log.info(self, "restart : {0:10}{1}" .format(service_name, "[OK]")) except OSError as e: - Log.error(self, "Failed to restart services \{0} {1} {2}" - .format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, "Failed to restart services \{0}" + .format(service_name)) + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) def reload_service(self, service_name): try: @@ -64,8 +67,7 @@ class EEService(): .format(service_name, "[OK]")) return True else: - Log.error(self, "reload : {0}{1}" - .format(service_name, "[FAIL]")) + Log.error(self, "reload : {0}".format(service_name)) Log.debug("{0}".format(retcode[1])) return False @@ -78,8 +80,9 @@ class EEService(): else: return False except OSError as e: - Log.error(self, "Failed to reload {0} {1} {2}" - .format(service_name, e, "[FAIL]")) + Log.error(self, "Failed to reload service {0}" + .format(service_name)) + Log.debug(self, "{0}".format(e)) sys.exit(1) def get_service_status(self, service_name): @@ -96,6 +99,7 @@ class EEService(): else: return False except OSError as e: - Log.error(self, "Unable to get services status \ {0}{1}{2}" - .format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, "Unable to get services status of {0}" + .format(service_name)) + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) return False diff --git a/ee/core/shellexec.py b/ee/core/shellexec.py index 54c85f1f..5f31f969 100644 --- a/ee/core/shellexec.py +++ b/ee/core/shellexec.py @@ -24,8 +24,9 @@ class EEShellExec(): if errormsg: Log.error(self, errormsg) else: - Log.error(self, "Unable to execute command \ {0}{1}{2}" - .format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, "Unable to execute command {0}" + .format(command)) + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) sys.exit(1) def invoke_editor(self, filepath, errormsg=''): @@ -35,6 +36,6 @@ class EEShellExec(): if errormsg: Log.error(self, errormsg) else: - Log.error(self, "Unable to edit file \ {0}{1}{2}" - .format(e.errno, e.strerror, "[FAIL]")) + Log.error(self, "Unable to edit file {0}".format(filepath)) + Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) sys.exit(1)