bug fix: show mysql status on cent7

plogical/test.py

@@ -1 +0,0 @@
-

serverStatus/views.py

@@ -237,19 +237,33 @@ def servicesStatus(request):
         dockerStatus.append(getServiceStats('docker'))
 
         # mysql status
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        result = s.connect_ex(('127.0.0.1', 3306))
 
-        if result == 0:
+        if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
-            sqlStatus.append(1)
+
-        else:
+            mysqlResult = ProcessUtilities.outputExecutioner('systemctl status mysql')
-            sqlStatus.append(0)
+
-        s.close()
+            if mysqlResult.find('active (running)') > -1:
+                sqlStatus.append(1)
+                sqlStatus.append(getMemStats('mariadbd'))
+            else:
+                sqlStatus.append(0)
+                sqlStatus.append(0)
+
 
-        if getServiceStats('mysql'):
-            sqlStatus.append(getMemStats('mysql'))
         else:
-            sqlStatus.append(0)
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            result = s.connect_ex(('127.0.0.1', 3306))
+
+            if result == 0:
+                sqlStatus.append(1)
+            else:
+                sqlStatus.append(0)
+            s.close()
+
+            if getServiceStats('mysql'):
+                sqlStatus.append(getMemStats('mysql'))
+            else:
+                sqlStatus.append(0)
 
         dnsStatus.append(getServiceStats('pdns'))
         if getServiceStats('pdns'):