diff --git a/plugins/simdht/class/mysql.py b/plugins/simdht/class/simdht_mysql.py similarity index 95% rename from plugins/simdht/class/mysql.py rename to plugins/simdht/class/simdht_mysql.py index c3a68a4fb..f682014dd 100755 --- a/plugins/simdht/class/mysql.py +++ b/plugins/simdht/class/simdht_mysql.py @@ -7,7 +7,7 @@ import sys sys.path.append("/usr/local/lib/python2.7/site-packages") -class mysql: +class simdht_mysql: __DB_PASS = None __DB_USER = 'root' __DB_PORT = 3306 diff --git a/plugins/simdht/index.py b/plugins/simdht/index.py index ef13fd982..d5a635317 100755 --- a/plugins/simdht/index.py +++ b/plugins/simdht/index.py @@ -24,7 +24,7 @@ def getPluginDir(): return mw.getPluginDir() + '/' + getPluginName() sys.path.append(getPluginDir() + "/class") -import mysql +import simdht_mysql def getServerDir(): @@ -216,7 +216,7 @@ def getDbConfInfo(): def pMysqlDb(): data = getDbConfInfo() - conn = mysql.mysql() + conn = simdht_mysql.simdht_mysql() conn.setHost(data['DB_HOST']) conn.setUser(data['DB_USER']) conn.setPwd(data['DB_PASS']) @@ -271,7 +271,7 @@ def getTrendData(): three = getMinData(pdb, 10) return mw.getJson([one, two, three]) except Exception as e: - print str(e) + # print str(e) return mw.getJson([0, 0, 0]) diff --git a/requirements.txt b/requirements.txt index 4407e3b01..74c0f7edd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,6 @@ requests==2.20.0 ConfigParser==3.5.0 MySQL-python==1.2.5 mysql-connector-python -flask-socketio==3.0.2 +flask-socketio==3.0.1 python-engineio==3.4.1 # pytest-shutil \ No newline at end of file