diff --git a/plugins/gogs/index.html b/plugins/gogs/index.html index fdd441d1e..e8127f1b6 100755 --- a/plugins/gogs/index.html +++ b/plugins/gogs/index.html @@ -3,7 +3,9 @@

服务

自启动

-

配置修改

+

自启动配置

+

运行配置

+

运行日志

diff --git a/plugins/gogs/index.py b/plugins/gogs/index.py index 2cb1c4d83..ba63ebb72 100755 --- a/plugins/gogs/index.py +++ b/plugins/gogs/index.py @@ -52,11 +52,16 @@ def getArgs(): return tmp -def getConf(): +def getInitdConf(): path = getPluginDir() + "/init.d/gogs.tpl" return path +def getConf(): + path = getServerDir() + "/custom/conf/app.ini" + return path + + def status(): data = public.execShell( "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'") @@ -154,6 +159,11 @@ def initdUinstall(): os.remove(initd_bin) return 'ok' + +def runLog(): + log_path = getServerDir() + '/log/gogs.log' + return log_path + if __name__ == "__main__": func = sys.argv[1] if func == 'status': @@ -172,9 +182,11 @@ if __name__ == "__main__": print initdInstall() elif func == 'initd_uninstall': print initdUinstall() - elif func == 'run_info': - print runInfo() + elif func == 'run_log': + print runLog() elif func == 'conf': print getConf() + elif func == 'init_conf': + print getInitdConf() else: print 'fail' diff --git a/plugins/openresty/index.html b/plugins/openresty/index.html index eda9543b4..36566c1de 100755 --- a/plugins/openresty/index.html +++ b/plugins/openresty/index.html @@ -5,7 +5,7 @@

自启动

配置修改

负载状态

-

错误日志

+

错误日志

diff --git a/static/app/public.js b/static/app/public.js index 98790e203..4d9ea2543 100755 --- a/static/app/public.js +++ b/static/app/public.js @@ -1588,11 +1588,16 @@ function pluginOpService(a, b, v) { //配置修改 --- start -function pluginConfig(_name, version){ +function pluginConfig(_name, version, func){ if ( typeof(version) == 'undefined' ){ version = ''; } + var func_name = 'conf'; + if ( typeof(func) != 'undefined' ){ + func_name = func; + } + var con = '

提示:Ctrl+F 搜索关键字,Ctrl+G 查找下一个,Ctrl+S 保存,Ctrl+Shift+R 查找替换!

\ \ \ @@ -1602,7 +1607,7 @@ function pluginConfig(_name, version){ $(".soft-man-con").html(con); var loadT = layer.msg('配置文件路径获取中...',{icon:16,time:0,shade: [0.3, '#000']}); - $.post('/plugins/run', {name:_name, func:'conf',version:version},function (data) { + $.post('/plugins/run', {name:_name, func:func_name,version:version},function (data) { layer.close(loadT); var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']}); @@ -1712,13 +1717,19 @@ function pluginOpInitD(a, b) { }) } -function pluginErrorLogs(_name, version){ +function pluginLogs(_name, version, func){ if ( typeof(version) == 'undefined' ){ version = ''; } + var func_name = 'error_log'; + if ( typeof(func) != 'undefined' ){ + func_name = func; + } + + var loadT = layer.msg('错误日志路径获取中...',{icon:16,time:0,shade: [0.3, '#000']}); - $.post('/plugins/run', {name:_name, func:'error_log',version:version},function (data) { + $.post('/plugins/run', {name:_name, func:func_name, version:version},function (data) { layer.close(loadT); var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']});