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/6] 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/6] 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/6] 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: From 0f0095a3bae7167adff83273dcbde379ae9cdb86 Mon Sep 17 00:00:00 2001 From: koxuan Date: Wed, 23 Sep 2020 23:54:40 +0000 Subject: [PATCH 4/6] loglevels added --- server.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/server.py b/server.py index 56e1812..bbc5a72 100644 --- a/server.py +++ b/server.py @@ -195,10 +195,26 @@ def kill(self): if "1" in line: logger.setLevel(logging.DEBUG) logger.info("Debug logs enabled") + elif "2" in line: + logger.setLevel(logging.INFO) + logger.info("Info logs enabled") + elif "3" in line: + logger.setLevel(logging.INFO) + logger.info("Warning logs enabled") + elif "4" in line: + logger.setLevel(logging.INFO) + logger.info("Error logs enabled") + elif "5" in line: + logger.setLevel(logging.INFO) + logger.info("Critical logs enabled") else: - logger.setLevel(logging.ERROR) - logger.info("Debug logs disabled") - + print('Error in logging config') + try: + multithreaded_server = Server() + multithreaded_server.run() + except KeyboardInterrupt: + self._logger.info("shutting down the server") + multithreaded_server.kill() try: multithreaded_server = Server() multithreaded_server.run() From 1b047d09216d0a39d9b682956dc13e541200f1a6 Mon Sep 17 00:00:00 2001 From: koxuan Date: Thu, 24 Sep 2020 03:02:39 +0000 Subject: [PATCH 5/6] update on and off with loglevel --- server.py | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/server.py b/server.py index bbc5a72..edba21b 100644 --- a/server.py +++ b/server.py @@ -190,25 +190,31 @@ def kill(self): except IOError: print("config file not found") f = '' - for line in f: - if "bluetoothlog=" in line: - if "1" in line: - logger.setLevel(logging.DEBUG) - logger.info("Debug logs enabled") - elif "2" in line: - logger.setLevel(logging.INFO) - logger.info("Info logs enabled") - elif "3" in line: - logger.setLevel(logging.INFO) - logger.info("Warning logs enabled") - elif "4" in line: - logger.setLevel(logging.INFO) - logger.info("Error logs enabled") - elif "5" in line: - logger.setLevel(logging.INFO) - logger.info("Critical logs enabled") - else: - print('Error in logging config') + + for line in f: + if "bluetoothlog=" in line and "1" in line: + if "bluetoothloglevel=" in line: + if "1" in line: + logger.setLevel(logging.DEBUG) + logger.info("Debug logs enabled") + elif "2" in line: + logger.setLevel(logging.INFO) + logger.info("Info logs enabled") + elif "3" in line: + logger.setLevel(logging.WARNING) + logger.info("Warning logs enabled") + elif "4" in line: + logger.setLevel(logging.ERROR) + logger.info("Error logs enabled") + elif "5" in line: + logger.setLevel(logging.CRITICAL) + logger.info("Critical logs enabled") + else: + print('Error in logging config') + else: + logger.setLevel(logging.ERROR) + logger.info("Error logs enabled") + try: multithreaded_server = Server() multithreaded_server.run() From 3fe4a5369dcfecd00284ad9d37f2c059593510a2 Mon Sep 17 00:00:00 2001 From: koxuan Date: Thu, 24 Sep 2020 03:28:01 +0000 Subject: [PATCH 6/6] fix bug --- server.py | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/server.py b/server.py index edba21b..342887f 100644 --- a/server.py +++ b/server.py @@ -187,33 +187,34 @@ def kill(self): logger.addHandler(fh) try: f = open("/etc/treehouses.conf", "r") + for line2 in f: + if "bluetoothlog=" in line2 and "1" in line2: + for line in f: + if "bluetoothloglevel=" in line: + if "1" in line: + logger.setLevel(logging.DEBUG) + logger.info("Debug logs enabled") + elif "2" in line: + logger.setLevel(logging.INFO) + logger.info("Info logs enabled") + elif "3" in line: + logger.setLevel(logging.WARNING) + logger.info("Warning logs enabled") + elif "4" in line: + logger.setLevel(logging.ERROR) + logger.info("Error logs enabled") + elif "5" in line: + logger.setLevel(logging.CRITICAL) + logger.info("Critical logs enabled") + else: + print('Error in logging config') + else: + logger.setLevel(logging.ERROR) + logger.info("Error logs enabled") except IOError: print("config file not found") f = '' - for line in f: - if "bluetoothlog=" in line and "1" in line: - if "bluetoothloglevel=" in line: - if "1" in line: - logger.setLevel(logging.DEBUG) - logger.info("Debug logs enabled") - elif "2" in line: - logger.setLevel(logging.INFO) - logger.info("Info logs enabled") - elif "3" in line: - logger.setLevel(logging.WARNING) - logger.info("Warning logs enabled") - elif "4" in line: - logger.setLevel(logging.ERROR) - logger.info("Error logs enabled") - elif "5" in line: - logger.setLevel(logging.CRITICAL) - logger.info("Critical logs enabled") - else: - print('Error in logging config') - else: - logger.setLevel(logging.ERROR) - logger.info("Error logs enabled") try: multithreaded_server = Server()