diff --git a/fishbook/version.py b/fishbook/version.py deleted file mode 100644 index 300e119..0000000 --- a/fishbook/version.py +++ /dev/null @@ -1,2 +0,0 @@ -__version__='0.1' -__year__ = '2019' diff --git a/fishbook_server/client.py b/fishbook_server/client.py index 1388ba9..88e6f6d 100755 --- a/fishbook_server/client.py +++ b/fishbook_server/client.py @@ -67,7 +67,7 @@ def send_request(host, port, request): return message.payload if message else "no response" -def run(host, port, action="search", value="test"): +def run(host, port, action="test", value="ping"): request = create_request(action, value) response = send_request(host, port, request) print(response) diff --git a/fishbook_server/cmd/test_client.py b/fishbook_server/cmd/test_client.py index 0087a49..1c97028 100644 --- a/fishbook_server/cmd/test_client.py +++ b/fishbook_server/cmd/test_client.py @@ -5,15 +5,13 @@ import argparse import fishbook_server.client as client def run(arguments): - client.run(arguments.host, arguments.port, arguments.action, arguments.value) + client.run(arguments.host, arguments.port) def create_parser(): parser = argparse.ArgumentParser(description="Run fishbook dataserver") parser.add_argument("-hs", "--host", type=str, default="", help="The host for which to listen. Use 127.0.0.1 for localhost or any other hosts simply leave it empty.") parser.add_argument("-pr", "--port", type=int, default=65432, help="The port on which the server should be listening which to listen. Default 9000.") - parser.add_argument("-a", "--action", type=str, default="search", help="") - parser.add_argument("-v", "--value", type=str, default="test", help="") return parser diff --git a/fishbook_server/libserver.py b/fishbook_server/libserver.py index d9747dd..683ab20 100644 --- a/fishbook_server/libserver.py +++ b/fishbook_server/libserver.py @@ -125,11 +125,9 @@ class Message: print("reading a message!") if self._jsonheader_len is None: self.process_protoheader() - print(self._jsonheader_len) if self._jsonheader_len is not None: if self.jsonheader is None: self.process_jsonheader() - print(self.jsonheader) if self.jsonheader: if self.request is None: self.process_request() @@ -188,7 +186,7 @@ class Message: if self.jsonheader["content-type"] == "text/json": encoding = self.jsonheader["content-encoding"] self.request = self._json_decode(data, encoding) - print("received request", repr(self.request), "from", self.addr) + print("received text request", repr(self.request), "from", self.addr) else: # Binary or unknown content-type self.request = data