From 63117a4bc54df6f361c0840c8abb83f0adb68fa9 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Wed, 19 Sep 2018 14:52:10 +0200 Subject: [PATCH 1/6] fix error --- plugins/template/template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/template/template.py b/plugins/template/template.py index f570a52..de1b78a 100644 --- a/plugins/template/template.py +++ b/plugins/template/template.py @@ -30,7 +30,7 @@ class BoswatchPlugin(Plugin): def __init__(self): """!Do not change anything here except the PLUGIN NAME in the super() call""" # PLEASE SET YOU PLUGIN NAME HERE !!!! - Plugin.__init__("template") + super().__init__("template") def onLoad(self): """!Called by import of the plugin""" From d95ab7781ed38ab674db550abe9b4847a279923e Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Wed, 19 Sep 2018 14:53:56 +0200 Subject: [PATCH 2/6] combine some todos --- boswatch/filter/doubeFilter.py | 3 +-- boswatch/utils/wildcard.py | 1 - bw_client.py | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/boswatch/filter/doubeFilter.py b/boswatch/filter/doubeFilter.py index 066e18d..c230155 100644 --- a/boswatch/filter/doubeFilter.py +++ b/boswatch/filter/doubeFilter.py @@ -13,8 +13,7 @@ @date: 15.01.2018 @author: Bastian Schroll @description: Class to implement a filter for double alarms -@todo test, refactor and document -@todo check_msg is not implemented yet +@todo test, refactor and document / check_msg is not implemented yet """ import logging import time diff --git a/boswatch/utils/wildcard.py b/boswatch/utils/wildcard.py index 636b27c..dc0f746 100644 --- a/boswatch/utils/wildcard.py +++ b/boswatch/utils/wildcard.py @@ -13,7 +13,6 @@ @date: 15.01.2018 @author: Bastian Schroll @description: Little Helper to replace wildcards in stings -@todo not completed yet """ import logging import time diff --git a/bw_client.py b/bw_client.py index 29fee0f..530abe5 100644 --- a/bw_client.py +++ b/bw_client.py @@ -91,8 +91,7 @@ try: bwPacket.addClientData() bwClient.transmit(str(bwPacket)) - # todo should we do this in an thread, to not block receiving ??? - # todo but then we should use transmit() and receive() with Lock() + # todo should we do this in an thread, to not block receiving ??? but then we should use transmit() and receive() with Lock() failedTransmits = 0 while not bwClient.receive() == "[ack]": # wait for ack or timeout if failedTransmits >= 3: From 1435d80f0fafad2d63bc90156af9ac15b04a7f6a Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 07:31:21 +0200 Subject: [PATCH 3/6] change import order --- test/test_ServerClient.py | 2 +- test/test_packet.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_ServerClient.py b/test/test_ServerClient.py index 48b030c..37e7ff2 100644 --- a/test/test_ServerClient.py +++ b/test/test_ServerClient.py @@ -14,8 +14,8 @@ @author: Bastian Schroll @description: Unittests for BOSWatch. File must be _run as "pytest" unittest """ -import pytest import logging +import pytest import time from boswatch.network.server import TCPServer diff --git a/test/test_packet.py b/test/test_packet.py index f311a22..77fef07 100644 --- a/test/test_packet.py +++ b/test/test_packet.py @@ -14,8 +14,8 @@ @author: Bastian Schroll @description: Unittests for BOSWatch. File must be _run as "pytest" unittest """ -import pytest import logging +import pytest from boswatch.packet.packet import Packet From 1d30c991808a19c1d32590110c4aa91c1694d902 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 07:37:10 +0200 Subject: [PATCH 4/6] change import order from pytest --- test/test_ServerClient.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_ServerClient.py b/test/test_ServerClient.py index 37e7ff2..a4398f5 100644 --- a/test/test_ServerClient.py +++ b/test/test_ServerClient.py @@ -15,8 +15,8 @@ @description: Unittests for BOSWatch. File must be _run as "pytest" unittest """ import logging -import pytest import time +import pytest from boswatch.network.server import TCPServer from boswatch.network.client import TCPClient From 1252a953a8f9b68290567d3c23953e74b6748ac8 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 07:58:26 +0200 Subject: [PATCH 5/6] add doc to server.py --- boswatch/network/server.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/boswatch/network/server.py b/boswatch/network/server.py index 9dd6567..f3a4be0 100644 --- a/boswatch/network/server.py +++ b/boswatch/network/server.py @@ -135,7 +135,11 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer): @staticmethod def getClientsConnected(): - # todo insert comment + """!A list of all connected clients + with their IP address and last seen timestamp + _clients[ThreadName] = {"address", "timestamp"} + + @return List of onnected clients""" # todo return full list or write a print/debug method? return _clients From da94581dc266a2560f10f4445c6df031ee759ea8 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 20 Sep 2018 23:55:53 +0200 Subject: [PATCH 6/6] fix doxy warning --- boswatch/packet/packet.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/boswatch/packet/packet.py b/boswatch/packet/packet.py index 801bc91..bf0103c 100644 --- a/boswatch/packet/packet.py +++ b/boswatch/packet/packet.py @@ -101,6 +101,5 @@ class Packet: """!Print a info message to the log on INFO level. Contains the most useful info about this packet. @todo not complete yet - must be edit to print nice formatted messages on console - - @param bwPacket: BOSWatch packet instance""" + """ logging.info("[%s]", self.get("mode"))