Merge branch 'master' of https://github.com/uselibrary/mdserver-web

requirements.txt

@@ -1,5 +1,5 @@
 setuptools>=33.1.1
-werkzeug>=2.0.3
+Werkzeug>=1.0.1
 wheel==0.33.6
 gunicorn==20.1.0
 requests==2.20.0
@@ -21,7 +21,7 @@ Flask-SocketIO==3.0.2
 zmq==0.0.0
 pymongo
 pillow
-Jinja2>=2.11.3
+Jinja2>=2.11.2
 mysqlclient>=2.0.3
 flask-caching>=1.10.1
 mysql-connector-python

scripts/install/debian.sh

@@ -96,7 +96,7 @@ pip3 install gevent==21.1.2
 pip3 install gevent-websocket==0.10.1
 pip3 install requests==2.20.0
 pip3 install flask-caching>=1.10.1
-pip3 install python-socketio==4.2.0
+pip3 install python-socketio==5.2.0
 pip3 install psutil==5.9.1 
 pip3 install pymongo
 pip3 install psutil
@@ -105,13 +105,15 @@ pip3 install psutil
 cd /www/server/mdserver-web && ./cli.sh start
 sleep 5
 
-cd /www/server/mdserver-web && ./cli.sh stop
-cd /www/server/mdserver-web && ./cli.sh start
-
 
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-port=$(cat /www/server/mdserver-web/data/port.pl)
+
+port=7200
+if [ -f /www/server/mdserver-web/data/port.pl ];then
+    port=$(cat /www/server/mdserver-web/data/port.pl)
+fi
+
 n=0
 while [[ "$isStart" != "" ]];
 do

scripts/update/debian.sh

@@ -38,7 +38,7 @@ pip3 install gevent==21.1.2
 pip3 install gevent-websocket==0.10.1
 pip3 install requests==2.20.0
 pip3 install flask-caching>=1.10.1
-pip3 install python-socketio==4.2.0
+pip3 install flask-socketio==5.2.0
 pip3 install psutil==5.9.1 
 pip3 install pymongo
 
@@ -51,11 +51,12 @@ fi
 
 echo -e "stop mw"
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
-port=7200
 
+port=7200
 if [ -f /www/server/mdserver-web/data/port.pl ];then
     port=$(cat /www/server/mdserver-web/data/port.pl)
 fi
+
 n=0
 while [[ "$isStart" != "" ]];
 do