From 16a8424b80b5fbcb8b59787fecbf06d2d8ea8d80 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Mon, 17 Sep 2018 20:15:30 +0200 Subject: [PATCH 01/10] logs on linux in /var/log/boswatch/ on windows in log/ folder --- boswatch/utils/paths.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/boswatch/utils/paths.py b/boswatch/utils/paths.py index eac59b2..3c0fe8d 100644 --- a/boswatch/utils/paths.py +++ b/boswatch/utils/paths.py @@ -17,12 +17,18 @@ import logging import os import sys +import platform logging.debug("- %s loaded", __name__) # todo searching for root part is not a nice solution atm ROOT_PATH = os.path.dirname(sys.modules['boswatch'].__file__).replace("\\", "/") + "/../" -LOG_PATH = ROOT_PATH + "log/" + +if platform.system() is "Linux": + LOG_PATH = "/var/log/boswatch/" +else: + LOG_PATH = ROOT_PATH + "log/" + CONFIG_PATH = ROOT_PATH + "config/" PLUGIN_PATH = ROOT_PATH + "plugins/" CSV_PATH = ROOT_PATH + "csv/" From a6e10dd6f562846c89117d4b308b58c4b5bbf796 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 18 Sep 2018 05:48:18 +0200 Subject: [PATCH 02/10] fix error --- boswatch/utils/paths.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boswatch/utils/paths.py b/boswatch/utils/paths.py index 3c0fe8d..9b52f12 100644 --- a/boswatch/utils/paths.py +++ b/boswatch/utils/paths.py @@ -24,7 +24,7 @@ logging.debug("- %s loaded", __name__) # todo searching for root part is not a nice solution atm ROOT_PATH = os.path.dirname(sys.modules['boswatch'].__file__).replace("\\", "/") + "/../" -if platform.system() is "Linux": +if platform.system() == "Linux": LOG_PATH = "/var/log/boswatch/" else: LOG_PATH = ROOT_PATH + "log/" From 2037921ee669f54dcb1849cb200588edb4f91cef Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Wed, 19 Sep 2018 15:09:30 +0200 Subject: [PATCH 03/10] change a todo to note --- boswatch/utils/paths.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boswatch/utils/paths.py b/boswatch/utils/paths.py index 9b52f12..c553e3a 100644 --- a/boswatch/utils/paths.py +++ b/boswatch/utils/paths.py @@ -21,7 +21,7 @@ import platform logging.debug("- %s loaded", __name__) -# todo searching for root part is not a nice solution atm +# note searching for root part is not a nice solution atm ROOT_PATH = os.path.dirname(sys.modules['boswatch'].__file__).replace("\\", "/") + "/../" if platform.system() == "Linux": From aca20faf18aa40455e9f755e823547712f5696d6 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 08:02:42 +0200 Subject: [PATCH 04/10] add comment --- boswatch/utils/paths.py | 1 + 1 file changed, 1 insertion(+) diff --git a/boswatch/utils/paths.py b/boswatch/utils/paths.py index c553e3a..b1078de 100644 --- a/boswatch/utils/paths.py +++ b/boswatch/utils/paths.py @@ -24,6 +24,7 @@ logging.debug("- %s loaded", __name__) # note searching for root part is not a nice solution atm ROOT_PATH = os.path.dirname(sys.modules['boswatch'].__file__).replace("\\", "/") + "/../" +# here a system adaption for the paths can be implemented if platform.system() == "Linux": LOG_PATH = "/var/log/boswatch/" else: From 478868c225f94961782c1e848f78d4440a9fcef0 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 08:10:40 +0200 Subject: [PATCH 05/10] change comment --- boswatch/utils/paths.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boswatch/utils/paths.py b/boswatch/utils/paths.py index b1078de..d9cfb48 100644 --- a/boswatch/utils/paths.py +++ b/boswatch/utils/paths.py @@ -24,7 +24,7 @@ logging.debug("- %s loaded", __name__) # note searching for root part is not a nice solution atm ROOT_PATH = os.path.dirname(sys.modules['boswatch'].__file__).replace("\\", "/") + "/../" -# here a system adaption for the paths can be implemented +# implements a system adaption for the paths if platform.system() == "Linux": LOG_PATH = "/var/log/boswatch/" else: From 449c8f97261c81649bde7a0bc491266bc8142099 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 09:51:47 +0200 Subject: [PATCH 06/10] add system adaption for config path --- boswatch/utils/paths.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boswatch/utils/paths.py b/boswatch/utils/paths.py index d9cfb48..ea1766d 100644 --- a/boswatch/utils/paths.py +++ b/boswatch/utils/paths.py @@ -27,10 +27,11 @@ ROOT_PATH = os.path.dirname(sys.modules['boswatch'].__file__).replace("\\", "/") # implements a system adaption for the paths if platform.system() == "Linux": LOG_PATH = "/var/log/boswatch/" + CONFIG_PATH = "/etc/boswatch/" else: LOG_PATH = ROOT_PATH + "log/" + CONFIG_PATH = ROOT_PATH + "config/" -CONFIG_PATH = ROOT_PATH + "config/" PLUGIN_PATH = ROOT_PATH + "plugins/" CSV_PATH = ROOT_PATH + "csv/" BIN_PATH = ROOT_PATH + "_bin/" From f0081d6e6dc774fd16cbd9ccbf12a6d29ff5b579 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 10:53:09 +0200 Subject: [PATCH 07/10] fix path --- boswatch/utils/paths.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boswatch/utils/paths.py b/boswatch/utils/paths.py index ea1766d..9f57498 100644 --- a/boswatch/utils/paths.py +++ b/boswatch/utils/paths.py @@ -27,7 +27,7 @@ ROOT_PATH = os.path.dirname(sys.modules['boswatch'].__file__).replace("\\", "/") # implements a system adaption for the paths if platform.system() == "Linux": LOG_PATH = "/var/log/boswatch/" - CONFIG_PATH = "/etc/boswatch/" + CONFIG_PATH = "/etc/opt/boswatch/" else: LOG_PATH = ROOT_PATH + "log/" CONFIG_PATH = ROOT_PATH + "config/" From d08381108fc5e576928d80475241fd867ad0ee59 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 14:19:51 +0200 Subject: [PATCH 08/10] fix false type from _clients in server.py --- boswatch/network/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boswatch/network/server.py b/boswatch/network/server.py index 9dd6567..429ce85 100644 --- a/boswatch/network/server.py +++ b/boswatch/network/server.py @@ -26,7 +26,7 @@ _dataPackets = [] _lockDataPackets = threading.Lock() # module wide global list for all currently connected clients -_clients = {} # _clients[ThreadName] = {"address", "timestamp"} +_clients = [] # _clients[ThreadName] = {"address", "timestamp"} _lockClients = threading.Lock() From c90327614160e67703c30911a9727eada50cc3b1 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 14:19:51 +0200 Subject: [PATCH 09/10] Revert "fix false type from _clients in server.py" This reverts commit d08381108fc5e576928d80475241fd867ad0ee59. --- boswatch/network/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boswatch/network/server.py b/boswatch/network/server.py index 429ce85..9dd6567 100644 --- a/boswatch/network/server.py +++ b/boswatch/network/server.py @@ -26,7 +26,7 @@ _dataPackets = [] _lockDataPackets = threading.Lock() # module wide global list for all currently connected clients -_clients = [] # _clients[ThreadName] = {"address", "timestamp"} +_clients = {} # _clients[ThreadName] = {"address", "timestamp"} _lockClients = threading.Lock() From ff8e1347bd4e9ba32bbb8f8f658f307f1bbc7273 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Fri, 21 Sep 2018 12:43:43 +0200 Subject: [PATCH 10/10] add fixme warning --- boswatch/utils/paths.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boswatch/utils/paths.py b/boswatch/utils/paths.py index 9f57498..d3f00a7 100644 --- a/boswatch/utils/paths.py +++ b/boswatch/utils/paths.py @@ -29,6 +29,8 @@ if platform.system() == "Linux": LOG_PATH = "/var/log/boswatch/" CONFIG_PATH = "/etc/opt/boswatch/" else: + # FIXME LOG_PATH not used actually + # path is fixed in logger config.ini LOG_PATH = ROOT_PATH + "log/" CONFIG_PATH = ROOT_PATH + "config/"