From 897049cd0b92a73b7fde78062e435a244bfd4b1c Mon Sep 17 00:00:00 2001 From: victor <4152386+koxuan@users.noreply.github.com> Date: Sat, 12 Sep 2020 06:34:48 +0000 Subject: [PATCH 1/3] reads from /etc/treehouses.conf bluetoothlog --- server.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 7a97a0c..1949522 100644 --- a/server.py +++ b/server.py @@ -180,8 +180,16 @@ def kill(self): handler = logging.StreamHandler(sys.stdout) formatter = logging.Formatter("%(asctime)s: %(message)s") logger.addHandler(handler) - logger.setLevel(logging.DEBUG) - logger.info("Debug logs enabled") + f = open("/etc/treehouses.conf", "r") + for line in f: + if "bluetoothlog=" in line: + if "1" in line: + logger.setLevel(logging.DEBUG) + logger.info("Debug logs enabled") + else: + logger.setLevel(logging.ERROR) + logger.info("Debug logs disabled") + try: multithreaded_server = Server() multithreaded_server.run() From 2d70a8c30afedc9a966dc7f12df38a706669ca5c Mon Sep 17 00:00:00 2001 From: root Date: Sat, 19 Sep 2020 02:33:27 +0000 Subject: [PATCH 2/3] update log --- server.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server.py b/server.py index 1949522..306e974 100644 --- a/server.py +++ b/server.py @@ -180,6 +180,11 @@ def kill(self): handler = logging.StreamHandler(sys.stdout) formatter = logging.Formatter("%(asctime)s: %(message)s") logger.addHandler(handler) + fh = logging.FileHandler('/var/log/bluetooth.log', 'a') + fh.setLevel(logging.DEBUG) + formatter = logging.Formatter('%(asctime)s %(levelname)s: %(funcName)s:%(lineno)d %(message)s') + fh.setFormatter(formatter) + logger.addHandler(fh) f = open("/etc/treehouses.conf", "r") for line in f: if "bluetoothlog=" in line: From 387042f9f58e132f9e86c64ebd865e670e5520b3 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 19 Sep 2020 05:11:07 +0000 Subject: [PATCH 3/3] add safeguard if config file not found --- server.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 306e974..56e1812 100644 --- a/server.py +++ b/server.py @@ -180,12 +180,16 @@ def kill(self): handler = logging.StreamHandler(sys.stdout) formatter = logging.Formatter("%(asctime)s: %(message)s") logger.addHandler(handler) - fh = logging.FileHandler('/var/log/bluetooth.log', 'a') + fh = logging.FileHandler('/var/log/bluetooth.log', mode= 'a') fh.setLevel(logging.DEBUG) formatter = logging.Formatter('%(asctime)s %(levelname)s: %(funcName)s:%(lineno)d %(message)s') fh.setFormatter(formatter) logger.addHandler(fh) - f = open("/etc/treehouses.conf", "r") + try: + f = open("/etc/treehouses.conf", "r") + except IOError: + print("config file not found") + f = '' for line in f: if "bluetoothlog=" in line: if "1" in line: