From 0cc6a429f90ae3520f1a4f5d7bcd63fa4526b931 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Sat, 14 Dec 2019 16:23:47 +0500
Subject: [PATCH] bug fix: scheduled backups

---
 plogical/backupSchedule.py      | 12 +++++++++++-
 plogical/backupScheduleLocal.py | 11 +++++++++++
 test.sh                         |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 test.sh

diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py
index 1e59a537c..12a59ea91 100755
--- a/plogical/backupSchedule.py
+++ b/plogical/backupSchedule.py
@@ -17,9 +17,11 @@ from plogical.processUtilities import ProcessUtilities
 from random import randint
 import json, requests
 from datetime import datetime
+import signal
+
 
 class backupSchedule:
-
+    now = datetime.now()
 
     @staticmethod
     def remoteBackupLogging(fileName, message):
@@ -262,6 +264,14 @@ class backupSchedule:
 def main():
     backupSchedule.prepare()
 
+def handler(signum, frame):
+    diff = datetime.now() - backupSchedule.now
+    logging.CyberCPLogFileWriter.writeToFile('Signal: %s, time spent: %s' % (str(signum), str(diff.total_seconds())))
+
 
 if __name__ == "__main__":
+    for i in range(1,32):
+        if i == 9 or i == 19 or i == 32:
+            continue
+        signal.signal(i, handler)
     main()
\ No newline at end of file
diff --git a/plogical/backupScheduleLocal.py b/plogical/backupScheduleLocal.py
index d5ce1a6bf..73f3d5ae7 100755
--- a/plogical/backupScheduleLocal.py
+++ b/plogical/backupScheduleLocal.py
@@ -4,9 +4,12 @@ import time
 from backupSchedule import backupSchedule
 from plogical.processUtilities import ProcessUtilities
 from re import match,I,M
+import signal
+from datetime import datetime
 
 class backupScheduleLocal:
     localBackupPath = '/home/cyberpanel/localBackupPath'
+    now = datetime.now()
 
     @staticmethod
     def prepare():
@@ -62,5 +65,13 @@ def main():
     backupScheduleLocal.prepare()
 
 
+def handler(signum, frame):
+    diff = datetime.now() - backupScheduleLocal.now
+    logging.CyberCPLogFileWriter.writeToFile('Signal: %s, time spent: %s' % (str(signum), str(diff.total_seconds())))
+
 if __name__ == "__main__":
+    for i in range(1,32):
+        if i == 9 or i == 19 or i == 32:
+            continue
+        signal.signal(i, handler)
     main()
\ No newline at end of file
diff --git a/test.sh b/test.sh
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test.sh
@@ -0,0 +1 @@
+