up

.gitignore

@@ -107,7 +107,6 @@ venv.bak/
 tmp/*
 *.swp
 *.zip
-scripts/init.d/mw
 logs/*
 data/*.db
 data/control.conf
@@ -132,7 +131,9 @@ include
 share
 pip-selfcheck.json
 
+scripts/init.d/mw
 scripts/mdserver-web
+
 data/api_login.txt
 data/sessions
 data/ssl.pl

plugins/openresty/index.py

@@ -300,7 +300,7 @@ def runInfo():
     # 取Openresty负载状态
     try:
         url = 'http://127.0.0.1/nginx_status'
-        result = mw.httpGet(url)
+        result = mw.httpGet(url, timeout=1)
         tmp = result.split()
         data = {}
         data['active'] = tmp[2]