Merge branch 'python'

Author: gau1991

.travis.yml

@@ -3,6 +3,7 @@ notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/bd77a26eab56de803949
+      - https://webhooks.gitter.im/e/e3e2feb8384c77bf1a8a
     on_success: always  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false

config/bash_completion.d/ee_auto.rc

@@ -11,7 +11,7 @@ _ee_complete()
     # SETUP THE BASE LEVEL (everything after "ee")
     if [ $COMP_CWORD -eq 1 ]; then
         COMPREPLY=( $(compgen \
-                      -W "stack site debug clean secure" \
+                      -W "stack site debug clean secure import-slow-log" \
                       -- $cur) )
 
 

ee/cli/plugins/site.py

@@ -886,6 +886,10 @@ def default(self):
                                   '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']:

ee/cli/plugins/stack.py

@@ -24,6 +24,7 @@
 import os
 import pwd
 import grp
+import codecs
 from ee.cli.plugins.stack_services import EEStackStatusController
 from ee.core.logging import Log
 
@@ -93,14 +94,24 @@ def pre_pref(self, apt_packages):
                            keyserver="keyserver.ubuntu.com")
             chars = ''.join(random.sample(string.ascii_letters, 8))
             Log.debug(self, "Pre-seeding MySQL")
+            Log.debug(self, "echo \"percona-server-server-5.6 "
+                      "percona-server-server/root_password "
+                      "password \" | "
+                      "debconf-set-selections")
             EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 "
                                  "percona-server-server/root_password "
                                  "password {chars}\" | "
-                                 "debconf-set-selections".format(chars=chars))
+                                 "debconf-set-selections".format(chars=chars),
+                                 log=False)
+            Log.debug(self, "echo \"percona-server-server-5.6 "
+                      "percona-server-server/root_password_again "
+                      "password \" | "
+                      "debconf-set-selections")
             EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 "
                                  "percona-server-server/root_password_again "
                                  "password {chars}\" | "
-                                 "debconf-set-selections".format(chars=chars))
+                                 "debconf-set-selections".format(chars=chars),
+                                 log=False)
             mysql_config = """
             [client]
             user = root
@@ -366,7 +377,6 @@ def post_pref(self, apt_packages, packages):
                     EEService.reload_service(self, 'nginx')
                     self.msg = (self.msg + ["HTTP Auth User Name: easyengine"]
                                 + ["HTTP Auth Password : {0}".format(passwd)])
-
             if set(EEVariables.ee_php).issubset(set(apt_packages)):
                 # Create log directories
                 if not os.path.exists('/var/log/php5/'):
@@ -390,20 +400,24 @@ def post_pref(self, apt_packages, packages):
 
                 # Prase /etc/php5/fpm/php-fpm.conf
                 config = configparser.ConfigParser()
-                config.read('/etc/php5/fpm/php-fpm.conf')
+                Log.debug(self, "configuring php file"
+                          "/etc/php5/fpm/php-fpm.conf")
+                config.read_file(codecs.open("/etc/php5/fpm/php-fpm.conf",
+                                             "r", "utf8"))
                 config['global']['error_log'] = '/var/log/php5/fpm.log'
                 config.remove_option('global', 'include')
                 config['global']['log_level'] = 'notice'
                 config['global']['include'] = '/etc/php5/fpm/pool.d/*.conf'
-                with open('/etc/php5/fpm/php-fpm.conf',
-                          encoding='utf-8', mode='w') as configfile:
+                with codecs.open('/etc/php5/fpm/php-fpm.conf',
+                                 encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "writting php5 configuration into "
                               "/etc/php5/fpm/php-fpm.conf")
                     config.write(configfile)
 
                 # Parse /etc/php5/fpm/pool.d/www.conf
                 config = configparser.ConfigParser()
-                config.read('/etc/php5/fpm/pool.d/www.conf')
+                config.read_file(codecs.open('/etc/php5/fpm/pool.d/www.conf',
+                                             "r", "utf8"))
                 config['www']['ping.path'] = '/ping'
                 config['www']['pm.status_path'] = '/status'
                 config['www']['pm.max_requests'] = '500'
@@ -414,8 +428,8 @@ def post_pref(self, apt_packages, packages):
                 config['www']['request_terminate_timeout'] = '300'
                 config['www']['pm'] = 'ondemand'
                 config['www']['listen'] = '127.0.0.1:9000'
-                with open('/etc/php5/fpm/pool.d/www.conf',
-                          encoding='utf-8', mode='w') as configfile:
+                with codecs.open('/etc/php5/fpm/pool.d/www.conf',
+                                 encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "writting PHP5 configuration into "
                               "/etc/php5/fpm/pool.d/www.conf")
                     config.write(configfile)
@@ -628,7 +642,7 @@ def post_pref(self, apt_packages, packages):
                 Log.debug(self, "Setting Privileges to dovecot ")
                 # EEShellExec.cmd_exec(self, "chown -R vmail:vmail /var/lib"
                 #                     "/dovecot")
-                EEFileUtils.chown(self, "/var/lig/dovecot", 'vmail', 'vmail',
+                EEFileUtils.chown(self, "/var/lib/dovecot", 'vmail', 'vmail',
                                   recursive=True)
                 EEShellExec.cmd_exec(self, "sievec /var/lib/dovecot/sieve/"
                                      "default.sieve")
@@ -809,11 +823,14 @@ def post_pref(self, apt_packages, packages):
                 EEMysql.execute(self, 'grant select on *.* to \'anemometer\''
                                 '@\'{0}\''.format(self.app.config.get('mysql',
                                                   'grant-host')))
+                Log.debug(self, "grant all on slow-query-log.*"
+                          " to anemometer@root_user IDENTIFIED BY password ")
                 EEMysql.execute(self, 'grant all on slow_query_log.* to'
                                 '\'anemometer\'@\'{0}\' IDENTIFIED'
                                 ' BY \'{1}\''.format(self.app.config.get(
                                                      'mysql', 'grant-host'),
-                                                     chars))
+                                                     chars),
+                                errormsg="cannot grant privillages", log=False)
 
                 # Custom Anemometer configuration
                 Log.debug(self, "configration Anemometer")
@@ -870,11 +887,14 @@ def post_pref(self, apt_packages, packages):
                 Log.debug(self, "Creating vimbadmin database if not exist")
                 EEMysql.execute(self, "create database if not exists"
                                       " vimbadmin")
-                Log.debug(self, "Granting all privileges on vimbadmin ")
+                Log.debug(self, "Granting all privileges on vimbadmin.* to "
+                          "vimbadmin@root IDENTIFIED BY password  ")
                 EEMysql.execute(self, "grant all privileges on vimbadmin.* to"
                                 " vimbadmin@{0} IDENTIFIED BY"
                                 " '{1}'".format(self.app.config.get('mysql',
-                                                'grant-host'), vm_passwd))
+                                                'grant-host'), vm_passwd),
+                                errormsg="Cannot grant "
+                                "user privileges", log=False)
                 vm_salt = (''.join(random.sample(string.ascii_letters +
                                                  string.ascii_letters, 64)))
 

ee/core/fileutils.py

@@ -42,6 +42,8 @@ def create_symlink(self, paths, errormsg=''):
         dst = paths[1]
         if not os.path.islink(dst):
             try:
+                Log.debug(self, "Creating Symbolic link, Source:{0}, Dest:{1}"
+                          .format(src, dst))
                 os.symlink(src, dst)
             except Exception as e:
                 Log.debug(self, "{0}{1}".format(e.errno, e.strerror))
@@ -54,6 +56,7 @@ def remove_symlink(self, filepath):
             Removes symbolic link for the path provided with filepath
         """
         try:
+            Log.debug(self, "Removing symbolic link: {0}".format(filepath))
             os.unlink(filepath)
         except Exception as e:
             Log.debug(self, "{0}".format(e))
@@ -66,6 +69,8 @@ def copyfile(self, src, dest):
             dest : destination path
         """
         try:
+            Log.debug(self, "Copying file, Source:{0}, Dest:{1}"
+                      .format(src, dest))
             shutil.copy2(src, dest)
         except shutil.Error as e:
             Log.debug(self, "{0}".format(e))
@@ -84,6 +89,9 @@ def searchreplace(self, fnm, sstr, rstr):
             rstr: replace string
         """
         try:
+            Log.debug(self, "Doning search and replace, File:{0},"
+                      "Source string:{1}, Dest String:{2}"
+                      .format(fnm, sstr, rstr))
             for line in fileinput.input(fnm, inplace=True):
                 print(line.replace(sstr, rstr), end='')
             fileinput.close()
@@ -112,6 +120,8 @@ def chdir(self, path):
             Path : path for destination directory
         """
         try:
+            Log.debug(self, "Changing directory to {0}"
+                      .format(path))
             os.chdir(path)
         except OSError as e:
             Log.debug(self, "{err}".format(err=e.strerror))
@@ -129,6 +139,10 @@ def chown(self, path, user, group, recursive=False):
         userid = pwd.getpwnam(user)[2]
         groupid = pwd.getpwnam(user)[3]
         try:
+            Log.debug(self, "Changing ownership of {0}, Userid:{1},Groupid:{2}"
+                      .format(path, userid, groupid))
+            # Change inside files/directory permissions only if recursive flag
+            # is set
             if recursive:
                 for root, dirs, files in os.walk(path):
                     for d in dirs:
@@ -137,8 +151,7 @@ def chown(self, path, user, group, recursive=False):
                     for f in files:
                         os.chown(os.path.join(root, f), userid,
                                  groupid)
-            else:
-                os.chown(path, userid, groupid)
+            os.chown(path, userid, groupid)
         except shutil.Error as e:
             Log.debug(self, "{0}".format(e))
             Log.error(self, "Unable to change owner : {0}".format(path))
@@ -154,6 +167,8 @@ def chmod(self, path, perm, recursive=False):
             recursive: change permission recursively for all files
         """
         try:
+            Log.debug(self, "Changing permission of {0}, Perm:{1}"
+                      .format(path, perm))
             if recursive:
                 for root, dirs, files in os.walk(path):
                     for d in dirs:
@@ -173,6 +188,8 @@ def mkdir(self, path):
             Similar to `mkdir -p`
         """
         try:
+            Log.debug(self, "Creating directories: {0}"
+                      .format(path))
             os.makedirs(path)
         except OSError as e:
             Log.debug(self, "{0}".format(e.strerror))
@@ -196,6 +213,8 @@ def grep(self, fnm, sstr):
             Searches for string in file and returns the matched line.
         """
         try:
+            Log.debug(self, "Finding string {0} to file {1}"
+                      .format(sstr, fnm))
             for line in open(fnm, encoding='utf-8'):
                 if sstr in line:
                     return line
@@ -208,6 +227,7 @@ def rm(self, path):
         """
             Remove files
         """
+        Log.debug(self, "Removing {0}".format(path))
         if EEFileUtils.isexist(self, path):
             try:
                 if os.path.isdir(path):

ee/core/shellexec.py

@@ -1,5 +1,4 @@
 """EasyEngine shell executaion functions."""
-from subprocess import Popen
 from ee.core.logging import Log
 import os
 import sys
@@ -16,11 +15,19 @@ def cmd_exec(self, command, errormsg='', log=True):
         try:
             if log:
                 Log.debug(self, "Running command: {0}".format(command))
-            retcode = subprocess.getstatusoutput(command)
-            if retcode[0] == 0:
+            with subprocess.Popen([command], stdout=subprocess.PIPE,
+                                  stderr=subprocess.PIPE, shell=True) as proc:
+                (cmd_stdout_bytes, cmd_stderr_bytes) = proc.communicate()
+                (cmd_stdout, cmd_stderr) = (cmd_stdout_bytes.decode('utf-8',
+                                            "replace"),
+                                            cmd_stderr_bytes.decode('utf-8',
+                                            "replace"))
+
+            if proc.returncode == 0:
                 return True
             else:
-                Log.debug(self, retcode[1])
+                Log.debug(self, "Command Output: {0}, Command Error: {1}"
+                                .format(cmd_stdout, cmd_stderr))
                 return False
         except OSError as e:
             if errormsg:

install

@@ -319,6 +319,6 @@ else
         fi
     else
         ee_lib_echo_fail "You allready have EasyEngine $new_ee_version" | tee -ai $EE_INSTALL_LOG
+        exit 1
     fi
-    exit 1
 fi

setup.py

@@ -104,6 +104,6 @@
 source /etc/bash_completion.d/ee_auto.rc
 \033[94m
 EasyEngine (ee) installed successfully
-EasyEngine (ee) help: https://rtcamp.com/easyengine/docs/
+EasyEngine (ee) help: http://docs.rtcamp.com/easyengine/
 \033[0m
 """)