From 7e8e3545a420dff145d506087c1391605465542e Mon Sep 17 00:00:00 2001
From: Johannes Findeisen <you@hanez.org>
Date: Mon, 27 Dec 2021 03:54:23 +0100
Subject: [PATCH] Exception handling fixes

---
 uplink.py        | 26 +++++++++++++++-----------
 uplink/uplink.py |  2 --
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/uplink.py b/uplink.py
index 7006eb5..bf3233e 100755
--- a/uplink.py
+++ b/uplink.py
@@ -30,7 +30,7 @@ import time
 from uplink.uplink import Uplink
 
 # Version format: MAJOR.FEATURE.FIXES
-__version__ = "0.4.0-development"
+__version__ = "0.4.1-development"
 
 # TODO: CHECK ALL ERROR HANDLING!!!
 # TODO: Implement logging
@@ -109,35 +109,39 @@ if __name__ == "__main__":
     try:
         with open(config_path, 'r') as configfile:
             config_data = configfile.read()
-        _config = json.loads(config_data)
+        config = json.loads(config_data)
     except "OSError, PermissionDenied, RuntimeError, ValueError" as err:
         # TODO: Replace all lines like this with generic Python logging
         print(str("Uplink: Configuration Error!" + err))
         sys.exit(1)
 
     try:
-        _config["interval"]
+        config["interval"]
     except KeyError:
         # interval not configured in configuration; using default value
-        _config["interval"] = 60
+        config["interval"] = 60
 
     if args.interval:
         # interval set in args is overriding configuration and default
-        _config["interval"] = args.interval
+        config["interval"] = args.interval
 
-    uplink = Uplink("/tmp/uplink.pid", _config)
+    uplink = Uplink("/tmp/uplink.pid", config)
 
     if args.cron:
-        for i in range(len(_config["uplinks"])):
-            uplink.get_data(_config, i)
+        for i in range(len(config["uplinks"])):
+            uplink.get_data(config, i)
     elif args.daemon:
         uplink.start()
     elif args.foreground:
         while True:
-            for i in range(len(_config["uplinks"])):
-                uplink.get_data(_config, i)
+            for i in range(len(config["uplinks"])):
+                uplink.get_data(config, i)
                 # TODO: print data formatted to STDOUT
-            time.sleep(_config["interval"])
+            try:
+                time.sleep(config["interval"])
+            except KeyboardInterrupt as err:
+                print(str("uplink: program terminated by user!"))
+                exit(0)
     else:
 
         print("uplink: error: no run mode selected; use --cron (-c), --daemon (-d) or --foreground (-f) to run uplink. "
diff --git a/uplink/uplink.py b/uplink/uplink.py
index 618744f..aed0729 100644
--- a/uplink/uplink.py
+++ b/uplink/uplink.py
@@ -113,6 +113,4 @@ class Uplink(Daemon):
             for i in range(len(self.config["uplinks"])):
                 t = Thread(target=self.get_data, args=(self.get_config(), i))
                 t.start()
-            if self.config["cron"]:
-                break
             time.sleep(self.config["interval"])