Lot of refactoring and tests. Maybe all this will be veverted but the code still runs
This commit is contained in:
parent
9d200a5942
commit
6ec071287f
12 changed files with 228 additions and 214 deletions
114
uplink
114
uplink
|
|
@ -1,114 +0,0 @@
|
|||
#!/usr/bin/python3 -d
|
||||
|
||||
# Copyright (c) 2020 Johannes Findeisen <you@hanez.org>
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is furnished
|
||||
# to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice (including the next
|
||||
# paragraph) shall be included in all copies or substantial portions of the
|
||||
# Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
|
||||
# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
# 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.
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import logging
|
||||
import logging.handlers
|
||||
from uplink import Uplink
|
||||
|
||||
# Version format: MAJOR.FEATURE.FIXES
|
||||
__version__ = "0.3.0-development"
|
||||
|
||||
# TODO: Implement logging
|
||||
# TODO: Implement --no-daemon for a single run e.g. "cron mode"
|
||||
# TODO: Implement CLI output messages
|
||||
# TODO: IDEA: Implement a small webserver inline to get statistics and graphs over the network? Or maybe better as a
|
||||
# separate daemon
|
||||
|
||||
|
||||
# TODO: Make use of the args passed to the script
|
||||
# TODO: Cleanup args and reduce to only what makes sense
|
||||
def parse_args():
|
||||
parser = argparse.ArgumentParser(
|
||||
description="uplink is a tool to monitor the link status of AVM FRITZ!Box Cable and DSL based routers.",
|
||||
epilog="uplink is not some program expecting uplinks to work!",
|
||||
prog="uplink")
|
||||
|
||||
parser.add_argument("config", metavar="CONFIGFILE", help="the configfile to use")
|
||||
|
||||
mode = parser.add_mutually_exclusive_group()
|
||||
mode.add_argument("--cron", default=False, dest="cron", action="store_true",
|
||||
help="cron mode executes the script only once without loop (default: false)")
|
||||
|
||||
mode.add_argument("--daemon", default=False, dest="daemon", action="store_true",
|
||||
help="run as native daemon (default: false)")
|
||||
|
||||
mode.add_argument("--foreground", default=True, dest="foreground", action="store_true",
|
||||
help="run in foreground (default: true)")
|
||||
|
||||
parser.add_argument("-i", "--interval", default=60, type=int,
|
||||
help="seconds poll interval (default: 60)")
|
||||
|
||||
parser.add_argument("-b", "--database", metavar="DATABASE", help="database to use")
|
||||
|
||||
parser.add_argument("-u", "--user", type=str, help="database username")
|
||||
|
||||
parser.add_argument("-p", "--password", type=str, help="database password")
|
||||
|
||||
parser.add_argument("-l", "--logfile", metavar="FILE", help="logfile to use")
|
||||
|
||||
parser.add_argument("-c", "--log-count", default=5, type=int,
|
||||
help="maximum number of logfiles in rotation (default: 5)")
|
||||
|
||||
parser.add_argument("-m", "--log-size", default=10485760, type=int,
|
||||
help="maximum logfile size in bytes (default: 10485760)")
|
||||
|
||||
parser.add_argument("-s", "--stdout", default=False, dest="stdout", action="store_true", help="log to stdout")
|
||||
|
||||
output = parser.add_mutually_exclusive_group()
|
||||
output.add_argument("-q", "--quiet", action="store_const", dest="log_level", const=logging.ERROR,
|
||||
help="output only errors")
|
||||
|
||||
output.add_argument("-w", "--warning", action="store_const", dest="log_level", const=logging.WARNING,
|
||||
help="output warnings")
|
||||
|
||||
output.add_argument("-v", "--verbose", action="store_const", dest="log_level", const=logging.INFO,
|
||||
help="output info messages")
|
||||
|
||||
output.add_argument("-d", "--debug", action="store_const", dest="log_level", const=logging.DEBUG,
|
||||
help="output debug messages")
|
||||
output.set_defaults(loglevel=logging.ERROR)
|
||||
|
||||
parser.add_argument("--version", action="version", version="%(prog)s " + str(__version__))
|
||||
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
args = parse_args()
|
||||
|
||||
# TODO: Read --version argument and print program version; then exit.
|
||||
|
||||
# TODO: Cleanup config.json and only define what really is needed
|
||||
config_path = args.config
|
||||
try:
|
||||
with open(config_path, 'r') as configfile:
|
||||
config_data = configfile.read()
|
||||
_config = json.loads(config_data)
|
||||
except Exception as err:
|
||||
# TODO: Replace all lines like this with generic Python logging
|
||||
print(str("Uplink: Configuration Error!"))
|
||||
exit(1)
|
||||
|
||||
uplink = Uplink("/tmp/uplink.pid", _config)
|
||||
uplink.start()
|
||||
5
uplink/__init__.py
Normal file
5
uplink/__init__.py
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
"""
|
||||
uplink
|
||||
|
||||
library for the uplink project
|
||||
"""
|
||||
112
uplink/daemon.py
Normal file
112
uplink/daemon.py
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
"""
|
||||
Original Source:
|
||||
https://web.archive.org/web/20131017130434/http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/
|
||||
https://web.archive.org/web/20131017130434/http://www.jejik.com/files/examples/daemon3x.py
|
||||
See daemon3x.py in the uplink source tree.
|
||||
|
||||
More Information:
|
||||
https://franklingu.github.io/programming/2016/03/01/creating-daemon-process-python-example-explanation/
|
||||
https://dpbl.wordpress.com/2017/02/12/a-tutorial-on-python-daemon/
|
||||
"""
|
||||
|
||||
import sys
|
||||
import os
|
||||
import time
|
||||
import atexit
|
||||
import signal
|
||||
|
||||
|
||||
# TODO: Check why pid files are not being deleted when sending the TERM signal
|
||||
class Daemon:
|
||||
|
||||
def __init__(self, pid_file):
|
||||
self.pid_file = pid_file
|
||||
|
||||
def daemonize(self):
|
||||
try:
|
||||
pid = os.fork()
|
||||
if pid > 0:
|
||||
sys.exit(0)
|
||||
except OSError as err:
|
||||
sys.stderr.write('fork #1 failed: {0}\n'.format(err))
|
||||
sys.exit(1)
|
||||
|
||||
os.chdir('/')
|
||||
os.setsid()
|
||||
os.umask(0)
|
||||
|
||||
try:
|
||||
pid = os.fork()
|
||||
if pid > 0:
|
||||
sys.exit(0)
|
||||
except OSError as err:
|
||||
sys.stderr.write('fork #2 failed: {0}\n'.format(err))
|
||||
sys.exit(1)
|
||||
|
||||
sys.stdout.flush()
|
||||
sys.stderr.flush()
|
||||
si = open(os.devnull, 'r')
|
||||
so = open(os.devnull, 'a+')
|
||||
se = open(os.devnull, 'a+')
|
||||
|
||||
os.dup2(si.fileno(), sys.stdin.fileno())
|
||||
os.dup2(so.fileno(), sys.stdout.fileno())
|
||||
os.dup2(se.fileno(), sys.stderr.fileno())
|
||||
|
||||
atexit.register(self.del_pid)
|
||||
|
||||
pid = str(os.getpid())
|
||||
with open(self.pid_file, 'w+') as f:
|
||||
f.write(pid + '\n')
|
||||
|
||||
def del_pid(self):
|
||||
os.remove(self.pid_file)
|
||||
|
||||
def start(self):
|
||||
try:
|
||||
with open(self.pid_file, 'r') as pf:
|
||||
pid = int(pf.read().strip())
|
||||
except IOError:
|
||||
pid = None
|
||||
|
||||
if pid:
|
||||
message = "pid_file {0} already exist. Daemon already running?\n"
|
||||
sys.stderr.write(message.format(self.pid_file))
|
||||
sys.exit(1)
|
||||
|
||||
self.daemonize()
|
||||
self.run()
|
||||
|
||||
def stop(self):
|
||||
try:
|
||||
with open(self.pid_file, 'r') as pf:
|
||||
pid = int(pf.read().strip())
|
||||
except IOError:
|
||||
pid = None
|
||||
|
||||
if not pid:
|
||||
message = "pid_file {0} does not exist. Daemon not running?\n"
|
||||
sys.stderr.write(message.format(self.pid_file))
|
||||
return
|
||||
|
||||
try:
|
||||
while 1:
|
||||
os.kill(pid, signal.SIGTERM)
|
||||
time.sleep(0.1)
|
||||
except OSError as err:
|
||||
e = str(err.args)
|
||||
if e.find("No such process") > 0:
|
||||
if os.path.exists(self.pid_file):
|
||||
os.remove(self.pid_file)
|
||||
else:
|
||||
print(str(err.args))
|
||||
sys.exit(1)
|
||||
|
||||
def restart(self):
|
||||
self.stop()
|
||||
self.start()
|
||||
|
||||
def run(self):
|
||||
"""Override this method when you subclass Daemon.
|
||||
It will be called after the process has been daemonized by
|
||||
start() or restart()."""
|
||||
122
uplink/daemon3x.py
Normal file
122
uplink/daemon3x.py
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
"""Generic linux daemon base class for python 3.x."""
|
||||
|
||||
import sys, os, time, atexit, signal
|
||||
|
||||
class daemon:
|
||||
"""A generic daemon class.
|
||||
|
||||
Usage: subclass the daemon class and override the run() method."""
|
||||
|
||||
def __init__(self, pidfile): self.pidfile = pidfile
|
||||
|
||||
def daemonize(self):
|
||||
"""Deamonize class. UNIX double fork mechanism."""
|
||||
|
||||
try:
|
||||
pid = os.fork()
|
||||
if pid > 0:
|
||||
# exit first parent
|
||||
sys.exit(0)
|
||||
except OSError as err:
|
||||
sys.stderr.write('fork #1 failed: {0}\n'.format(err))
|
||||
sys.exit(1)
|
||||
|
||||
# decouple from parent environment
|
||||
os.chdir('/')
|
||||
os.setsid()
|
||||
os.umask(0)
|
||||
|
||||
# do second fork
|
||||
try:
|
||||
pid = os.fork()
|
||||
if pid > 0:
|
||||
|
||||
# exit from second parent
|
||||
sys.exit(0)
|
||||
except OSError as err:
|
||||
sys.stderr.write('fork #2 failed: {0}\n'.format(err))
|
||||
sys.exit(1)
|
||||
|
||||
# redirect standard file descriptors
|
||||
sys.stdout.flush()
|
||||
sys.stderr.flush()
|
||||
si = open(os.devnull, 'r')
|
||||
so = open(os.devnull, 'a+')
|
||||
se = open(os.devnull, 'a+')
|
||||
|
||||
os.dup2(si.fileno(), sys.stdin.fileno())
|
||||
os.dup2(so.fileno(), sys.stdout.fileno())
|
||||
os.dup2(se.fileno(), sys.stderr.fileno())
|
||||
|
||||
# write pidfile
|
||||
atexit.register(self.delpid)
|
||||
|
||||
pid = str(os.getpid())
|
||||
with open(self.pidfile,'w+') as f:
|
||||
f.write(pid + '\n')
|
||||
|
||||
def delpid(self):
|
||||
os.remove(self.pidfile)
|
||||
|
||||
def start(self):
|
||||
"""Start the daemon."""
|
||||
|
||||
# Check for a pidfile to see if the daemon already runs
|
||||
try:
|
||||
with open(self.pidfile,'r') as pf:
|
||||
|
||||
pid = int(pf.read().strip())
|
||||
except IOError:
|
||||
pid = None
|
||||
|
||||
if pid:
|
||||
message = "pidfile {0} already exist. " + \
|
||||
"Daemon already running?\n"
|
||||
sys.stderr.write(message.format(self.pidfile))
|
||||
sys.exit(1)
|
||||
|
||||
# Start the daemon
|
||||
self.daemonize()
|
||||
self.run()
|
||||
|
||||
def stop(self):
|
||||
"""Stop the daemon."""
|
||||
|
||||
# Get the pid from the pidfile
|
||||
try:
|
||||
with open(self.pidfile,'r') as pf:
|
||||
pid = int(pf.read().strip())
|
||||
except IOError:
|
||||
pid = None
|
||||
|
||||
if not pid:
|
||||
message = "pidfile {0} does not exist. " + \
|
||||
"Daemon not running?\n"
|
||||
sys.stderr.write(message.format(self.pidfile))
|
||||
return # not an error in a restart
|
||||
|
||||
# Try killing the daemon process
|
||||
try:
|
||||
while 1:
|
||||
os.kill(pid, signal.SIGTERM)
|
||||
time.sleep(0.1)
|
||||
except OSError as err:
|
||||
e = str(err.args)
|
||||
if e.find("No such process") > 0:
|
||||
if os.path.exists(self.pidfile):
|
||||
os.remove(self.pidfile)
|
||||
else:
|
||||
print (str(err.args))
|
||||
sys.exit(1)
|
||||
|
||||
def restart(self):
|
||||
"""Restart the daemon."""
|
||||
self.stop()
|
||||
self.start()
|
||||
|
||||
def run(self):
|
||||
"""You should override this method when you subclass Daemon.
|
||||
|
||||
It will be called after the process has been daemonized by
|
||||
start() or restart()."""
|
||||
|
||||
98
uplink/uplink.py
Normal file
98
uplink/uplink.py
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
import pymysql
|
||||
import socket
|
||||
import time
|
||||
import calendar
|
||||
|
||||
try:
|
||||
from fritzconnection.fritzconnection.lib.fritzstatus import FritzStatus
|
||||
except ImportError:
|
||||
from fritzconnection.lib.fritzstatus import FritzStatus
|
||||
|
||||
from threading import Thread
|
||||
from uplink.daemon import Daemon
|
||||
|
||||
|
||||
class Uplink(Daemon):
|
||||
|
||||
def __init__(self, pid_file, config):
|
||||
self.pid_file = pid_file
|
||||
self.config = config
|
||||
|
||||
@staticmethod
|
||||
def get_data(config, inc):
|
||||
try:
|
||||
# TODO: Think about using a DB ORM (SQLAlchemy?) to make this program supporting different databases like
|
||||
# sqlite and Postgres
|
||||
con = pymysql.connect(host=config["database_host"],
|
||||
user=config["database_user"],
|
||||
password=config["database_password"],
|
||||
database=config["database"])
|
||||
except Exception as err:
|
||||
# TODO: Replace all lines like this with generic Python logging
|
||||
print(str("Uplink: Database connection failed: " + str(err)))
|
||||
exit(1)
|
||||
|
||||
timestamp = calendar.timegm(time.gmtime())
|
||||
local_time = time.localtime(timestamp)
|
||||
d = time.strftime("%Y-%m-%d ", local_time)
|
||||
t = time.strftime("%H:%M:%S", local_time)
|
||||
|
||||
try:
|
||||
fc = FritzStatus(address=config["uplinks"][inc]["ip"], password=config["uplinks"][inc]["password"])
|
||||
except Exception as err:
|
||||
# TODO: Replace all lines like this with generic Python logging
|
||||
print(str(str(err) + " on device with ip: " + config["uplinks"][inc]["ip"]))
|
||||
# TODO: Fix to long lines and make the SQL statement more readable
|
||||
sql = 'INSERT INTO log (timestamp, date, time, internal_ip, is_linked, is_connected, provider, message, ' \
|
||||
'source_host) VALUES (\"' + str(timestamp) + '\",\"' + str(d) + '\",\"' + str(t) + '\",\"' + \
|
||||
str(config["uplinks"][inc]["ip"]) + '\",\"' + "0" + '\",\"' + "0" + '\",\"' + \
|
||||
str(config["uplinks"][inc]["provider"]) + '\",\"ERROR: ' + str(err) + '\",\"' + socket.gethostname() + \
|
||||
'\")'
|
||||
|
||||
# TODO: Replace all lines like this with generic Python logging
|
||||
print(str(sql))
|
||||
with con.cursor() as cur:
|
||||
cur.execute(sql)
|
||||
con.commit()
|
||||
exit(1)
|
||||
|
||||
if fc.is_connected:
|
||||
status = "UP"
|
||||
else:
|
||||
status = "DOWN"
|
||||
|
||||
# TODO: Replace all lines like this with generic Python logging
|
||||
print(str(config["uplinks"][inc]["provider"] + " " + status))
|
||||
|
||||
# TODO: Fix to long lines and make the SQL statement more readable
|
||||
sql = 'INSERT INTO log (timestamp, date, time, uptime, internal_ip, external_ip, external_ipv6, is_linked, ' \
|
||||
'is_connected, str_transmission_rate_up, str_transmission_rate_down, str_max_bit_rate_up, ' \
|
||||
'str_max_bit_rate_down, str_max_linked_bit_rate_up, str_max_linked_bit_rate_down, modelname, ' \
|
||||
'system_version, provider, message, source_host) VALUES (\"' + str(timestamp) + '\",\"' + str(d) + '\",\"' + \
|
||||
str(t) + '\",\"' + str(fc.uptime) + '\",\"' + str(config["uplinks"][inc]["ip"]) + '\",\"' + \
|
||||
str(fc.external_ip) + '\",\"' + str(fc.external_ipv6) + '\",\"' + str(int(fc.is_linked)) + '\",\"' + \
|
||||
str(int(fc.is_connected)) + '\",\"' + str(fc.str_transmission_rate[0]) + '\",\"' + \
|
||||
str(fc.str_transmission_rate[1]) + '\",\"' + str(fc.str_max_bit_rate[0]) + '\",\"' + \
|
||||
str(fc.str_max_bit_rate[1]) + '\",\"' + str(fc.str_max_linked_bit_rate[0]) + '\",\"' + \
|
||||
str(fc.str_max_linked_bit_rate[1]) + '\",\"' + str(fc.modelname) + '\",\"' + \
|
||||
str(fc.fc.system_version) + '\",\"' + str(config["uplinks"][inc]["provider"]) + '\",\"' + status + '\",\"' + \
|
||||
socket.gethostname() + '\")'
|
||||
|
||||
# TODO: Replace all lines like this with generic Python logging
|
||||
print(str(sql))
|
||||
with con.cursor() as cur:
|
||||
cur.execute(sql)
|
||||
con.commit()
|
||||
con.close()
|
||||
|
||||
def get_config(self):
|
||||
return self.config
|
||||
|
||||
def run(self):
|
||||
while True:
|
||||
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"])
|
||||
Loading…
Add table
Add a link
Reference in a new issue