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

Logging to stdout color changes and some general fixes.

Browse source
This commit is contained in:
Johannes Findeisen 2021-06-10 05:56:32 +02:00
commit 29d91b18aa
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
uplink
View file

@ -35,15 +35,15 @@ import time
from fritzconnection.lib.fritzstatus import FritzStatus from fritzconnection.lib.fritzstatus import FritzStatus
from threading import Thread from threading import Thread
__version__ = "0.2" # Version format: MAJOR.FEATURE.FIXES
__version__ = "0.2.1"
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
PURPLE = "\033[95m" PURPLE = "\033[95m"
BLUE = "\033[94m" BLUE = "\033[94m"
YELLOW = "\033[93m" YELLOW = "\033[93m"
GREEN = "\033[92m" GRAY = "\033[90m"
RED = "\033[91m"
END = "\033[0m" END = "\033[0m"
@ -110,7 +110,7 @@ def get_data(config, inc):
password=config["database_password"], password=config["database_password"],
database=config["database"]) database=config["database"])
except Exception as err: except Exception as err:
logger.error("ERROR: Database connection failed!" + str(err)) logger.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()
@ -124,7 +124,7 @@ 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(RED + "ERROR: " + str(err) + " on device with ip:" + config["uplinks"][inc]["ip"] + END) logger.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, ' \
'source_host) VALUES (\"' + str(timestamp) + '\",\"' + str(d) + '\",\"' + str(t) + '\",\"' + \ 'source_host) VALUES (\"' + str(timestamp) + '\",\"' + str(d) + '\",\"' + str(t) + '\",\"' + \
str(config["uplinks"][inc]["ip"]) + '\",\"' + "0" + '\",\"' + "0" + '\",\"' + \ str(config["uplinks"][inc]["ip"]) + '\",\"' + "0" + '\",\"' + "0" + '\",\"' + \
@ -180,7 +180,7 @@ if __name__ == "__main__":
if args.stdout: if args.stdout:
formatter = logging.Formatter( formatter = logging.Formatter(
BLUE + "%(asctime)s" + END + ":" + PURPLE + "%(levelname)s" + END + ":" + YELLOW + "%(name)s" + END + ":%(message)s") PURPLE + "%(asctime)s" + END + ":" + BLUE + "%(levelname)s" + END + ":" + YELLOW + "%(name)s" + END + GRAY + ":%(message)s" + END)
handler1 = logging.StreamHandler(sys.stdout) handler1 = logging.StreamHandler(sys.stdout)
handler1.setFormatter(formatter) handler1.setFormatter(formatter)
root_logger.addHandler(handler1) root_logger.addHandler(handler1)
@ -203,11 +203,11 @@ if __name__ == "__main__":
config_data = configfile.read() config_data = configfile.read()
_config = json.loads(config_data) _config = json.loads(config_data)
except Exception as err: except Exception as err:
logger.error("ERROR: Reading configuration file '" + config_path + "' failed!: " + str(err)) logger.error("Reading configuration file '" + config_path + "' failed!: " + str(err))
exit(1) exit(1)
try: try:
run(_config) run(_config)
except KeyboardInterrupt: except KeyboardInterrupt:
logger.info("uplink terminated!") logger.info("Program terminated!")
exit(0) exit(0)