diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index dade137d9..7b4730167 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -173,7 +173,7 @@ MySQL_Opt public.writeFile('/etc/my.cnf', mycnf) os.system(shellStr) - WriteLog('TYPE_SOFE', 'MYSQL_CHECK_ERR') + public.writeLog('TYPE_SOFE', 'MYSQL_CHECK_ERR') return True @@ -188,10 +188,11 @@ def status(): def start(): initMysql = getServerDir() + '/scripts/mysql_install_db ' + '--basedir=' + \ getServerDir() + ' --datadir=' + getServerDir() + '/bin/mysql/data' - return initMysql + # return initMysql cmd = getServerDir() + '/bin/mysqld_safe ' + getServerDir() + \ '/conf/my.cnf ' + '--user=mysql&' + return cmd data = public.execShell(cmd) if data[0] == '': return 'stop' diff --git a/route/__init__.py b/route/__init__.py index 5f69baa37..cd880b575 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -175,12 +175,12 @@ def index(reqClass=None, reqAction=None, reqData=None): if not isLogined(): return redirect('/login') - if reqClass == 'config': - import config_api - data = config_api.config_api().get() - return render_template(reqClass + '.html', data=data) - else: - return render_template(reqClass + '.html') + # if reqClass == 'config': + import config_api + data = config_api.config_api().get() + return render_template(reqClass + '.html', data=data) + # else: + # return render_template(reqClass + '.html') className = reqClass + '_api' diff --git a/route/templates/default/layout.html b/route/templates/default/layout.html index 15c5ae88f..511127cee 100755 --- a/route/templates/default/layout.html +++ b/route/templates/default/layout.html @@ -22,7 +22,7 @@