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

Removed SQLite support at all. Will only support MariaDB/MySQL from now on.

Browse source
This commit is contained in:
Johannes Findeisen 2021-06-10 02:43:56 +02:00
commit 7449d7b68f
2 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config.example.json
View file

@ -1,12 +1,12 @@
{ {
"interval": 60, "interval": 60,
"database_type": "mysql",
"database": "uplink", "database": "uplink",
"database_host": "127.0.0.1", "database_host": "127.0.0.1",
"database_user": "USER", "database_user": "USER",
"database_password": "PASSWORD", "database_password": "PASSWORD",
"cron": false, "cron": false,
"daemon": false, "daemon": false,
"log_level": "",
"uplinks": [ "uplinks": [
{ "provider": "Cable Provider", "ip": "192.168.0.1", "password": "1234" }, { "provider": "Cable Provider", "ip": "192.168.0.1", "password": "1234" },
{ "provider": "DSL Provider", "ip": "192.168.1.1", "password": "1234" } { "provider": "DSL Provider", "ip": "192.168.1.1", "password": "1234" }

29
uplink
View file

@ -28,7 +28,6 @@ import logging.handlers
import os import os
import os.path as path import os.path as path
import pymysql import pymysql
#import sqlite3
import sys import sys
import time import time
@ -57,7 +56,7 @@ def parse_args():
mode = parser.add_mutually_exclusive_group() mode = parser.add_mutually_exclusive_group()
mode.add_argument("--cron", default=False, dest="cron", action="store_true", mode.add_argument("--cron", default=False, dest="cron", action="store_true",
help="cron mode executes the script only once without loop (default: false)") help="cron mode executes the script only once without loop (default: false)")
mode.add_argument("--daemon", default=False, dest="daemon", action="store_true", mode.add_argument("--daemon", default=False, dest="daemon", action="store_true",
help="run as native daemon (default: false)") help="run as native daemon (default: false)")
@ -104,22 +103,18 @@ def parse_args():
def get_data(config, inc): def get_data(config, inc):
#conn = sqlite3.connect(config["database"])
#c = conn.cursor()
try: try:
con = pymysql.connect(config["database_host"], con = pymysql.connect(host=config["database_host"],
config["database_user"], user=config["database_user"],
config["database_password"], password=config["database_password"],
config["database"]) database=config["database"])
except Exception as err: except Exception as err:
logger.error("ERROR: Database connection failed!" + str(err)) logger.error("ERROR: Database connection failed!" + str(err))
# see https://stackoverflow.com/questions/1489669/how-to-exit-the-entire-application-from-a-python-thread # see https://stackoverflow.com/questions/1489669/how-to-exit-the-entire-application-from-a-python-thread
# maybe the following is better. need to evaluate: # maybe the following is better. need to evaluate:
#thread.interrupt_main() # thread.interrupt_main()
os._exit(1) exit(1)
#for i in range(len(config["uplinks"])):
timestamp = calendar.timegm(time.gmtime()) timestamp = calendar.timegm(time.gmtime())
local_time = time.localtime(timestamp) local_time = time.localtime(timestamp)
d = time.strftime("%Y-%m-%d ", local_time) d = time.strftime("%Y-%m-%d ", local_time)
@ -128,14 +123,12 @@ def get_data(config, inc):
try: try:
fc = FritzStatus(address=config["uplinks"][inc]["ip"], password=config["uplinks"][inc]["password"]) fc = FritzStatus(address=config["uplinks"][inc]["ip"], password=config["uplinks"][inc]["password"])
except Exception as err: except Exception as err:
logger.error("ERROR: " + str(err) + " on device with ip:" + config["uplinks"][i]["ip"]) logger.error("ERROR: " + str(err) + " on device with ip:" + config["uplinks"][inc]["ip"])
sql = 'INSERT INTO log (timestamp, date, time, internal_ip, is_linked, is_connected, provider, message) ' \ sql = 'INSERT INTO log (timestamp, date, time, internal_ip, is_linked, is_connected, provider, message) ' \
'VALUES (\"' + str(timestamp) + '\",\"' + str(d) + '\",\"' + str(t) + '\",\"' + \ 'VALUES (\"' + str(timestamp) + '\",\"' + str(d) + '\",\"' + str(t) + '\",\"' + \
str(config["uplinks"][inc]["ip"]) + '\",\"' + "0" + '\",\"' + "0" + '\",\"' + \ str(config["uplinks"][inc]["ip"]) + '\",\"' + "0" + '\",\"' + "0" + '\",\"' + \
str(config["uplinks"][inc]["provider"]) + '\",\"ERROR: ' + str(err) + '\")' str(config["uplinks"][inc]["provider"]) + '\",\"ERROR: ' + str(err) + '\")'
logging.debug(sql) logging.debug(sql)
#c.execute(sql)
#conn.commit()
with con.cursor() as cur: with con.cursor() as cur:
cur.execute(sql) cur.execute(sql)
con.commit() con.commit()
@ -159,12 +152,9 @@ def get_data(config, inc):
str(fc.str_max_linked_bit_rate[1]) + '\",\"' + str(fc.modelname) + '\",\"' + \ str(fc.str_max_linked_bit_rate[1]) + '\",\"' + str(fc.modelname) + '\",\"' + \
str(fc.fc.system_version) + '\",\"' + str(config["uplinks"][inc]["provider"]) + '\",\"' + status + '\")' str(fc.fc.system_version) + '\",\"' + str(config["uplinks"][inc]["provider"]) + '\",\"' + status + '\")'
logging.debug(sql) logging.debug(sql)
#c.execute(sql)
#conn.commit()
with con.cursor() as cur: with con.cursor() as cur:
cur.execute(sql) cur.execute(sql)
con.commit() con.commit()
#conn.close()
con.close() con.close()
@ -185,7 +175,8 @@ if __name__ == "__main__":
root_logger = logging.getLogger() root_logger = logging.getLogger()
if args.stdout: if args.stdout:
formatter = logging.Formatter(BLUE+"%(asctime)s"+END+":"+PURPLE+"%(levelname)s"+END+":"+YELLOW+"%(name)s"+END+":%(message)s") formatter = logging.Formatter(
BLUE + "%(asctime)s" + END + ":" + PURPLE + "%(levelname)s" + END + ":" + YELLOW + "%(name)s" + END + ":%(message)s")
handler1 = logging.StreamHandler(sys.stdout) handler1 = logging.StreamHandler(sys.stdout)
handler1.setFormatter(formatter) handler1.setFormatter(formatter)
root_logger.addHandler(handler1) root_logger.addHandler(handler1)