diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py index f24a0d13e..5c0deb954 100644 --- a/plogical/IncScheduler.py +++ b/plogical/IncScheduler.py @@ -335,7 +335,6 @@ class IncScheduler(): message='Backup for %s successfully sent to Google Drive.' % (website.domain)).save() os.remove(completeFileToSend) - except BaseException as msg: GDriveJobLogs(owner=items, status=backupSchedule.ERROR, message='[Site] Site backup failed, Error message: %s.' % (str(msg))).save() diff --git a/plogical/dnsUtilities.py b/plogical/dnsUtilities.py index 417860b05..4120740c5 100755 --- a/plogical/dnsUtilities.py +++ b/plogical/dnsUtilities.py @@ -637,8 +637,12 @@ class DNS: record.save() if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20: - command = 'sudo systemctl restart pdns' - ProcessUtilities.executioner(command) + command = 'ls -la /etc/systemd/system/multi-user.target.wants/pdns.service' + result = ProcessUtilities.outputExecutioner(command) + + if result.find('No such file') == -1: + command = 'sudo systemctl restart pdns' + ProcessUtilities.executioner(command) return @@ -656,8 +660,12 @@ class DNS: record.save() if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20: - command = 'sudo systemctl restart pdns' - ProcessUtilities.executioner(command) + command = 'ls -la /etc/systemd/system/multi-user.target.wants/pdns.service' + result = ProcessUtilities.outputExecutioner(command) + + if result.find('No such file') == -1: + command = 'sudo systemctl restart pdns' + ProcessUtilities.executioner(command) return if type == 'MX': @@ -673,8 +681,12 @@ class DNS: record.save() if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20: - command = 'sudo systemctl restart pdns' - ProcessUtilities.executioner(command) + command = 'ls -la /etc/systemd/system/multi-user.target.wants/pdns.service' + result = ProcessUtilities.outputExecutioner(command) + + if result.find('No such file') == -1: + command = 'sudo systemctl restart pdns' + ProcessUtilities.executioner(command) return if Records.objects.filter(name=name, type=type).count() == 0: @@ -689,8 +701,13 @@ class DNS: auth=1) record.save() if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20: - command = 'sudo systemctl restart pdns' - ProcessUtilities.executioner(command) + + command = 'ls -la /etc/systemd/system/multi-user.target.wants/pdns.service' + result = ProcessUtilities.outputExecutioner(command) + + if result.find('No such file') == -1: + command = 'sudo systemctl restart pdns' + ProcessUtilities.executioner(command) ## Add Record to CF if SYNC Enabled