From dd2fbe86b482a7522b9b16d336a499bbe709d846 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 10 Dec 2018 15:10:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/openresty/index.py        | 25 ++++++++++++++-----------
 plugins/openresty/js/openresty.js | 26 +++++++++++++++-----------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py
index a61a6cbdc..8d9881648 100755
--- a/plugins/openresty/index.py
+++ b/plugins/openresty/index.py
@@ -203,17 +203,20 @@ def initdUinstall():
 
 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)
+    try:
+        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)
+    except Exception as e:
+        return 'oprenresty not started'
 
 
 def errorLogPath():
diff --git a/plugins/openresty/js/openresty.js b/plugins/openresty/js/openresty.js
index f6faaab21..b444f9e57 100755
--- a/plugins/openresty/js/openresty.js
+++ b/plugins/openresty/js/openresty.js
@@ -254,17 +254,21 @@ function getOpenrestyStatus() {
             return;
         }
         
-        var rdata = $.parseJSON(data.data);
-        var con = "<div><table class='table table-hover table-bordered'>\
-                        <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);
+        try {
+            var rdata = $.parseJSON(data.data);
+            var con = "<div><table class='table table-hover table-bordered'>\
+                            <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);
+        }catch(err){
+             showMsg(data.data, function(){}, null,3000);
+        }
     },'json');
 }