From 3c03bf92c45c359ad21d823538d40707165fec85 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Fri, 14 Jan 2022 15:20:07 +1100 Subject: [PATCH] maintenance task DB --- back/maintenance.py | 14 ++++++++++++-- front/php/server/devices.php | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/back/maintenance.py b/back/maintenance.py index 07422d1e..e462935b 100644 --- a/back/maintenance.py +++ b/back/maintenance.py @@ -1,5 +1,6 @@ import sys import shutil +import subprocess def main (): @@ -9,15 +10,24 @@ def main (): ## Main Commands if argument == 'backup_db': res = backup_db() + print(res) if argument == 'restore_db': res = restore_db() def backup_db (): # Header - shutil.copyfile("/home/pi/pialert/db/pialert.db", "/home/pi/pialert/config/pialert.db_bak") + result = subprocess.run(["cp", "/home/pi/pialert/db/pialert.db", "/home/pi/pialert/config/pialert.db_bak"], stderr=subprocess.PIPE, text=True) + #shutil.copyfile("/home/pi/pialert/db/pialert.db", "/home/pi/pialert/config/pialert.db_bak") def restore_db (): # Header - shutil.copyfile("/home/pi/pialert/config/pialert.db_bak", "/home/pi/pialert/db/pialert.db") \ No newline at end of file + shutil.copyfile("/home/pi/pialert/config/pialert.db_bak", "/home/pi/pialert/db/pialert.db") + + +#=============================================================================== +# BEGIN +#=============================================================================== +if __name__ == '__main__': + sys.exit(main()) \ No newline at end of file diff --git a/front/php/server/devices.php b/front/php/server/devices.php index bc005a5e..c74c16ee 100644 --- a/front/php/server/devices.php +++ b/front/php/server/devices.php @@ -259,7 +259,7 @@ function createBackupDB() { // echo "Error copying DB. SSH into instance and copy manually."; // } - $mystring = system('python /home/pi/pialert/back/maintenance.py backup_DB', $retval); + $mystring = system('python /home/pi/pialert/back/maintenance.py backup_db', $retval); // $command = escapeshellcmd('/home/pi/pialert/back/maintenance.py backup_DB'); // $output = shell_exec($command); @@ -282,7 +282,7 @@ function restoreBackupDB() { // echo "Error copying DB. SSH into instance and copy manually."; // } - $command = escapeshellcmd('/home/pi/pialert/back/maintenance.py restore_DB'); + $command = escapeshellcmd('/home/pi/pialert/back/maintenance.py restore_db'); $output = shell_exec($command);