diff --git a/ee/cli/plugins/secure.py b/ee/cli/plugins/secure.py index a9a78bc6..d29ac091 100644 --- a/ee/cli/plugins/secure.py +++ b/ee/cli/plugins/secure.py @@ -60,18 +60,23 @@ class EESecureController(CementBaseController): self.app.pargs.user_pass = password if password == "": self.app.pargs.user_pass = passwd + Log.debug(self, "printf username:" + "$(openssl passwd -crypt " + "password 2> /dev/null)\n\"" + "> /etc/nginx/htpasswd-ee 2>/dev/null") EEShellExec.cmd_exec(self, "printf \"{username}:" "$(openssl passwd -crypt " "{password} 2> /dev/null)\n\"" "> /etc/nginx/htpasswd-ee 2>/dev/null" .format(username=self.app.pargs.user_input, - password=self.app.pargs.user_pass)) + password=self.app.pargs.user_pass), + log=False) Log.info(self, "Successfully changed HTTP authentication" " username to : {username}" - .format(username=self.app.pargs.user_input)) + .format(username=self.app.pargs.user_input), log=False) Log.info(self, "Successfully changed HTTP authentication" " password to : {password}" - .format(password=self.app.pargs.user_pass)) + .format(password=self.app.pargs.user_pass), log=False) @expose(hide=True) def secure_port(self): diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index 81f698f4..142ed2e8 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -475,9 +475,9 @@ class EESiteCreateController(CementBaseController): if data['wp']: Log.info(self, Log.ENDC + "WordPress admin user :" - " {0}".format(ee_wp_creds['wp_user'])) + " {0}".format(ee_wp_creds['wp_user']), log=False) Log.info(self, Log.ENDC + "WordPress admin user password : {0}" - .format(ee_wp_creds['wp_pass'])) + .format(ee_wp_creds['wp_pass']), log=False) display_cache_settings(self, data) addNewSite(self, ee_www_domain, stype, cache, ee_site_webroot) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index fc13aec8..379f9d89 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -117,11 +117,13 @@ def setupdatabase(self, data): # Create MySQL User Log.debug(self, "Creating user {0}".format(ee_db_username)) + Log.debug(self, "create user {0}@{1} identified by ''" + .format(ee_db_username, ee_mysql_grant_host)) EEMysql.execute(self, "create user {0}@{1} identified by '{2}'" .format(ee_db_username, ee_mysql_grant_host, ee_db_password), - errormsg="Cannot setup database user") + errormsg="Cannot setup database user", log=False) # Grant permission Log.debug(self, "Setting up user privileges") diff --git a/ee/core/logging.py b/ee/core/logging.py index a02d47c6..0cea61d9 100644 --- a/ee/core/logging.py +++ b/ee/core/logging.py @@ -23,12 +23,14 @@ class Log: self.app.log.error(Log.FAIL + msg + Log.ENDC) self.app.close(1) - def info(self, msg, end='\n'): + def info(self, msg, end='\n', log=True): """ Logs info messages into log file """ + print(Log.OKBLUE + msg + Log.ENDC, end=end) - self.app.log.info(Log.OKBLUE + msg + Log.ENDC) + if log: + self.app.log.info(Log.OKBLUE + msg + Log.ENDC) def warn(self, msg): """ diff --git a/ee/core/mysql.py b/ee/core/mysql.py index d288dab8..c40b2bfd 100644 --- a/ee/core/mysql.py +++ b/ee/core/mysql.py @@ -9,7 +9,7 @@ from ee.core.logging import Log class EEMysql(): """Method for MySQL connection""" - def execute(self, statement, errormsg=''): + def execute(self, statement, errormsg='', log=True): """Get login details from ~/.my.cnf & Execute MySQL query""" config = configparser.RawConfigParser() cnfpath = expanduser("~")+"/.my.cnf" @@ -43,7 +43,10 @@ class EEMysql(): .format(e)) try: - Log.debug(self, "Executing MySQL statement: {0}".format(statement)) + if log: + Log.debug(self, "Executing MySQL statement: {0}" + .format(statement)) + cur.execute(statement) except Exception as e: cur.close()