From 386ed67354d88dac97a79053344d7be94b27f5de Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 8 Dec 2018 16:24:36 +0800
Subject: [PATCH] update

---
 plugins/openresty/conf/nginx_status.conf |  2 +-
 plugins/openresty/index.py               | 17 ++++++++++++++++
 plugins/openresty/js/openresty.js        | 25 +++++++++++++-----------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/plugins/openresty/conf/nginx_status.conf b/plugins/openresty/conf/nginx_status.conf
index e8dd05cef..1f9cdc9a2 100644
--- a/plugins/openresty/conf/nginx_status.conf
+++ b/plugins/openresty/conf/nginx_status.conf
@@ -1,5 +1,5 @@
 server {
-	listen 80;
+	listen 6666;
 	server_name 127.0.0.1;
 	allow 127.0.0.1;
 	location /nginx_status {
diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py
index 0e69b7310..cdd38d860 100755
--- a/plugins/openresty/index.py
+++ b/plugins/openresty/index.py
@@ -201,6 +201,21 @@ def initdUinstall():
     return 'ok'
 
 
+def runInfo():
+    # 取Openresty负载状态
+    result = public.httpGet('http://127.0.0.1:6666/nginx_status')
+    tmp = result.split()
+    data = {}
+    data['active'] = tmp[2]
+    data['accepts'] = tmp[9]
+    data['handled'] = tmp[7]
+    data['requests'] = tmp[8]
+    data['Reading'] = tmp[11]
+    data['Writing'] = tmp[13]
+    data['Waiting'] = tmp[15]
+    return public.getJson(data)
+
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -221,5 +236,7 @@ if __name__ == "__main__":
         print initdUinstall()
     elif func == 'conf':
         print getConf()
+    elif func == 'run_info':
+        print runInfo()
     else:
         print 'error'
diff --git a/plugins/openresty/js/openresty.js b/plugins/openresty/js/openresty.js
index e6d38a5fe..f6faaab21 100755
--- a/plugins/openresty/js/openresty.js
+++ b/plugins/openresty/js/openresty.js
@@ -249,18 +249,21 @@ function addWafKey(name) {
 function getOpenrestyStatus() {
 
     $.post('/plugins/run', {name:'openresty', func:'run_info'}, function(data) {
-        console.log(data);
-    },'json');
-    $.post('/ajax?action=GetNginxStatus', '', function(rdata) {
+        if (!data.status){
+            showMsg(data.msg, function(){}, null,3000);
+            return;
+        }
+        
+        var rdata = $.parseJSON(data.data);
         var con = "<div><table class='table table-hover table-bordered'>\
-						<tr><th>" + lan.bt.nginx_active + "</th><td>" + rdata.active + "</td></tr>\
-						<tr><th>" + lan.bt.nginx_accepts + "</th><td>" + rdata.accepts + "</td></tr>\
-						<tr><th>" + lan.bt.nginx_handled + "</th><td>" + rdata.handled + "</td></tr>\
-						<tr><th>" + lan.bt.nginx_requests + "</th><td>" + rdata.requests + "</td></tr>\
-						<tr><th>" + lan.bt.nginx_reading + "</th><td>" + rdata.Reading + "</td></tr>\
-						<tr><th>" + lan.bt.nginx_writing + "</th><td>" + rdata.Writing + "</td></tr>\
-						<tr><th>" + lan.bt.nginx_waiting + "</th><td>" + rdata.Waiting + "</td></tr>\
-					 </table></div>";
+                        <tr><th>活动连接(Active connections)</th><td>" + rdata.active + "</td></tr>\
+                        <tr><th>总连接次数(accepts)</th><td>" + rdata.accepts + "</td></tr>\
+                        <tr><th>总握手次数(handled)</th><td>" + rdata.handled + "</td></tr>\
+                        <tr><th>总请求数(requests)</th><td>" + rdata.requests + "</td></tr>\
+                        <tr><th>请求数(Reading)</th><td>" + rdata.Reading + "</td></tr>\
+                        <tr><th>响应数(Writing)</th><td>" + rdata.Writing + "</td></tr>\
+                        <tr><th>驻留进程(Waiting)</th><td>" + rdata.Waiting + "</td></tr>\
+                     </table></div>";
         $(".soft-man-con").html(con);
     },'json');
 }