From 87f5b259796b9d15f72a308d2aabd3a50f7d4265 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 14 Oct 2020 13:07:30 +0500 Subject: [PATCH 1/2] bug fix: show mysql status on cent7 --- plogical/test.py | 1 - serverStatus/views.py | 34 ++++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/plogical/test.py b/plogical/test.py index 8b1378917..e69de29bb 100755 --- a/plogical/test.py +++ b/plogical/test.py @@ -1 +0,0 @@ - diff --git a/serverStatus/views.py b/serverStatus/views.py index f8d9d03d9..b1b080d17 100755 --- a/serverStatus/views.py +++ b/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: - sqlStatus.append(1) - else: - sqlStatus.append(0) - s.close() + if ProcessUtilities.decideDistro() == ProcessUtilities.centos: + + mysqlResult = ProcessUtilities.outputExecutioner('systemctl status mysql') + + 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'): From 84e1bccd0d35714b42b9613aefe820dde4b15bcb Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 14 Oct 2020 14:47:12 +0500 Subject: [PATCH 2/2] bug fix: postfix files during upgrade --- plogical/upgrade.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 4ff034dfe..e80da3bdd 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1978,16 +1978,10 @@ echo $oConfig->Save() ? 'Done' : 'Error'; ### Restore dovecot/postfix conf - command = 'rm -rf %s' % (dovecotConfPath) + command = 'cp -pR %s/dovecot/ /etc/' % (configbackups) Upgrade.executioner(command, 0) - command = 'rm -rf %s' % (postfixConfPath) - Upgrade.executioner(command, 0) - - command = 'mv %s/dovecot /etc/' % (configbackups) - Upgrade.executioner(command, 0) - - command = 'mv %s/postfix /etc/' % (configbackups) + command = 'cp -pR %s/postfix/ /etc/' % (configbackups) Upgrade.executioner(command, 0) ## Restored @@ -2033,16 +2027,10 @@ echo $oConfig->Save() ? 'Done' : 'Error'; ### Restore dovecot/postfix conf - command = 'rm -rf %s' % (dovecotConfPath) + command = 'cp -pR %s/dovecot/ /etc/' % (configbackups) Upgrade.executioner(command, 0) - command = 'rm -rf %s' % (postfixConfPath) - Upgrade.executioner(command, 0) - - command = 'mv %s/dovecot /etc/' % (configbackups) - Upgrade.executioner(command, 0) - - command = 'mv %s/postfix /etc/' % (configbackups) + command = 'cp -pR %s/postfix/ /etc/' % (configbackups) Upgrade.executioner(command, 0) ## Restored