Merge pull request #333 from midoks/dev

mysql[apt/yum]迁移功能优化

plugins/mysql-apt/index.py

@@ -411,6 +411,7 @@ def my8cmd(version, method):
     initDreplace(version)
     # mysql 8.0  and 5.7
     try:
+        isInited = True
         if version == '5.7':
             isInited = initMysql57Data()
         elif version == '8.0':
@@ -483,7 +484,7 @@ def getMyDbPos():
     return tmp.groups()[0].strip()
 
 
-def setMyDbPos():
+def setMyDbPos(version=''):
     args = getArgs()
     data = checkArgs(args, ['datadir'])
     if not data[0]:
@@ -498,7 +499,7 @@ def setMyDbPos():
         mw.execShell('mkdir -p ' + t_datadir)
 
     # mw.execShell('/etc/init.d/mysqld stop')
-    stop()
+    stop(version)
     mw.execShell('cp -rf ' + s_datadir + '/* ' + t_datadir + '/')
     mw.execShell('chown -R mysql mysql ' + t_datadir)
     mw.execShell('chmod -R 755 ' + t_datadir)
@@ -512,7 +513,7 @@ def setMyDbPos():
 
     mycnf = mycnf.replace(s_datadir, t_datadir)
     mw.writeFile(myfile, mycnf)
-    start()
+    restart(version)
 
     result = mw.execShell(
         'ps aux|grep mysqld| grep -v grep|grep -v python')
@@ -2733,7 +2734,7 @@ if __name__ == "__main__":
     elif func == 'my_db_pos':
         print(getMyDbPos())
     elif func == 'set_db_pos':
-        print(setMyDbPos())
+        print(setMyDbPos(version))
     elif func == 'my_port':
         print(getMyPort())
     elif func == 'set_my_port':

plugins/mysql-yum/index.py

@@ -397,6 +397,7 @@ def my8cmd(version, method):
     initDreplace(version)
     # mysql 8.0  and 5.7
     try:
+        isInited = True
         if version == '5.7':
             isInited = initMysql57Data()
         elif version == '8.0':
@@ -469,7 +470,7 @@ def getMyDbPos():
     return tmp.groups()[0].strip()
 
 
-def setMyDbPos():
+def setMyDbPos(version=''):
     args = getArgs()
     data = checkArgs(args, ['datadir'])
     if not data[0]:
@@ -484,7 +485,7 @@ def setMyDbPos():
         mw.execShell('mkdir -p ' + t_datadir)
 
     # mw.execShell('/etc/init.d/mysqld stop')
-    stop()
+    stop(version)
     mw.execShell('cp -rf ' + s_datadir + '/* ' + t_datadir + '/')
     mw.execShell('chown -R mysql mysql ' + t_datadir)
     mw.execShell('chmod -R 755 ' + t_datadir)
@@ -498,17 +499,17 @@ def setMyDbPos():
 
     mycnf = mycnf.replace(s_datadir, t_datadir)
     mw.writeFile(myfile, mycnf)
-    start()
+    restart(version)
 
     result = mw.execShell(
-        'ps aux|grep mysqld| grep -v grep|grep -v python')
+        'ps aux|grep "mysql-apt/bin/usr/sbin/mysqld"| grep -v grep|grep -v python')
     if len(result[0]) > 10:
         mw.writeFile('data/datadir.pl', t_datadir)
         return mw.returnJson(True, '存储目录迁移成功!')
     else:
         mw.execShell('pkill -9 mysqld')
         mw.writeFile(myfile, mw.readFile(path + '/etc/my_backup.cnf'))
-        start()
+        start(version)
         return mw.returnJson(False, '文件迁移失败!')
 
 
@@ -2687,7 +2688,7 @@ if __name__ == "__main__":
     elif func == 'my_db_pos':
         print(getMyDbPos())
     elif func == 'set_db_pos':
-        print(setMyDbPos())
+        print(setMyDbPos(version))
     elif func == 'my_port':
         print(getMyPort())
     elif func == 'set_my_port':

route/__init__.py

@@ -210,7 +210,7 @@ def publicObject(toObject, func, action=None, get=None):
         return mw.getJson(data)
     except Exception as e:
         # API发生错误记录
-        print(traceback.print_exc())
+        #  print(traceback.print_exc())
         data = {'msg': '访问异常:' + str(e) + '!', "status": False}
         return mw.getJson(data)
 

scripts/update.sh

@@ -74,11 +74,6 @@ $CP_CMD -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
 rm -rf /tmp/master.zip
 rm -rf /tmp/mdserver-web-master
 
-
-if [ -f /etc/rc.d/init.d/mw ];then
-    sh /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
-fi
-
 #pip uninstall public
 echo "use system version: ${OSNAME}"
 cd /www/server/mdserver-web && bash scripts/update/${OSNAME}.sh

scripts/update/alma.sh

@@ -14,6 +14,9 @@ sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`

scripts/update/amazon.sh

@@ -16,6 +16,9 @@ yum install -y curl-devel libmcrypt libmcrypt-devel python3-devel
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`

scripts/update/arch.sh

@@ -8,12 +8,12 @@ LANG=en_US.UTF-8
 # echo y | pacman -Sy yaourt
 # echo y | pacman -Sy python3
 
-
-
-
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "start mw"
 cd /www/server/mdserver-web && bash cli.sh start

scripts/update/centos.sh

@@ -16,6 +16,9 @@ yum install -y curl-devel libmcrypt libmcrypt-devel python3-devel
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`

scripts/update/debian.sh

@@ -28,6 +28,9 @@ fi
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`

scripts/update/fedora.sh

@@ -13,6 +13,9 @@ sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`

scripts/update/freebsd.sh

@@ -8,6 +8,9 @@ cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "start mw"
 cd /www/server/mdserver-web && bash cli.sh start

scripts/update/opensuse.sh

@@ -11,6 +11,9 @@ LANG=en_US.UTF-8
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "start mw"
 cd /www/server/mdserver-web && bash cli.sh start

scripts/update/rhel.sh

@@ -16,6 +16,10 @@ fi
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
+
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
 

scripts/update/rocky.sh

@@ -18,6 +18,10 @@ cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
+
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
 

scripts/update/ubuntu.sh

@@ -16,6 +16,9 @@ cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
 
+if [ -f /etc/rc.d/init.d/mw ];then
+    bash /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
+fi
 
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`

scripts/update_dev.sh

@@ -64,20 +64,19 @@ fi
 # wget -O /tmp/dev.zip https://github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
 cd /tmp && unzip /tmp/dev.zip
 
-CP_CMD=/usr/bin/cp
-if [ -f /bin/cp ];then
-		CP_CMD=/bin/cp
+echo "update mdserver-web code start"
+if [ -f /usr/bin/cp ];then
+	/usr/bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
+elif [ -f /bin/cp ];then
+	/bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
+else
+	/usr/bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
 fi
-$CP_CMD -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
-
+echo "update mdserver-web code end"
 
 rm -rf /tmp/dev.zip
 rm -rf /tmp/mdserver-web-dev
 
-if [ -f /etc/rc.d/init.d/mw ];then
-    sh /etc/rc.d/init.d/mw stop && rm -rf /www/server/mdserver-web/scripts/init.d/mw && rm -rf /etc/rc.d/init.d/mw
-fi
-
 #pip uninstall public
 echo "use system version: ${OSNAME}"
 cd /www/server/mdserver-web && bash scripts/update/${OSNAME}.sh