linspector/uplink
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Lot of cleanups

Browse source
This commit is contained in:
Johannes Findeisen 2021-12-27 04:24:33 +01:00
commit 05b056a30c
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uplink.py
View file

@ -110,9 +110,9 @@ if __name__ == "__main__":
with open(config_path, 'r') as configfile: with open(config_path, 'r') as configfile:
config_data = configfile.read() config_data = configfile.read()
config = json.loads(config_data) config = json.loads(config_data)
except "OSError, PermissionDenied, RuntimeError, ValueError" as err: except Exception as err:
# TODO: Replace all lines like this with generic Python logging # TODO: Replace all lines like this with generic Python logging
print(str("Uplink: Configuration Error!" + err)) print(str("Uplink: Configuration Error!" + str(err)))
sys.exit(1) sys.exit(1)
try: try:
@ -141,8 +141,7 @@ if __name__ == "__main__":
time.sleep(config["interval"]) time.sleep(config["interval"])
except KeyboardInterrupt as err: except KeyboardInterrupt as err:
print(str("uplink: program terminated by user!")) print(str("uplink: program terminated by user!"))
exit(0) sys.exit(0)
else: else:
print("uplink: error: no run mode selected; use --cron (-c), --daemon (-d) or "
print("uplink: error: no run mode selected; use --cron (-c), --daemon (-d) or --foreground (-f) to run uplink. " "--foreground (-f) to run uplink. use --help for more information")
"use --help for more information")

9
uplink/uplink.py
View file

@ -18,8 +18,9 @@
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import pymysql
import socket import socket
import sys
import time import time
import calendar import calendar
@ -29,12 +30,14 @@ except ImportError:
from fritzconnection.lib.fritzstatus import FritzStatus from fritzconnection.lib.fritzstatus import FritzStatus
from threading import Thread from threading import Thread
import pymysql
from uplink.daemon import Daemon from uplink.daemon import Daemon
class Uplink(Daemon): class Uplink(Daemon):
def __init__(self, pid_file, config): def __init__(self, pid_file, config):
super().__init__(pid_file)
self.pid_file = pid_file self.pid_file = pid_file
self.config = config self.config = config
@ -50,7 +53,7 @@ class Uplink(Daemon):
except Exception as err: except Exception as err:
# TODO: Replace all lines like this with generic Python logging # TODO: Replace all lines like this with generic Python logging
print(str("Uplink: Database connection failed: " + str(err))) print(str("Uplink: Database connection failed: " + str(err)))
exit(1) sys.exit(1)
timestamp = calendar.timegm(time.gmtime()) timestamp = calendar.timegm(time.gmtime())
local_time = time.localtime(timestamp) local_time = time.localtime(timestamp)
@ -74,7 +77,7 @@ class Uplink(Daemon):
with con.cursor() as cur: with con.cursor() as cur:
cur.execute(sql) cur.execute(sql)
con.commit() con.commit()
exit(1) sys.exit(1)
if fc.is_connected: if fc.is_connected:
status = "UP" status = "UP"