Compare commits

..

No commits in common. "38cd99fa73c0f17718a542eacdcbefe55ea61209" and "25a7f003d829ba1bad4b4bc54dffafc665f76488" have entirely different histories.

4 changed files with 6 additions and 108 deletions

View File

@ -78,9 +78,3 @@ The full syntax is equivalent to:
```bash
announce_server start_registry --address 0.0.0.0 --port 4999 --heartbeat_interval 5 --heartbeat_timeout 3
```
To test connections, run:
```bash
announce_server start_client --host-ip 0.0.0.0 --host-port 4999
```

View File

@ -1,7 +1,6 @@
import argparse
from announce_server import register_service
from announce_server.client import start_client
from announce_server.server import start_server
@ -32,20 +31,6 @@ def main():
help="Heartbeat timeout in seconds",
)
# Start client subcommand
start_client_parser = subparsers.add_parser(
"start_client", help="Start the client server"
)
start_client_parser.add_argument(
"--host-ip",
type=str,
default="0.0.0.0",
help="Host IP address (default: 0.0.0.0)",
)
start_client_parser.add_argument(
"--host-port", type=int, default=4999, help="Host port number (default: 4999)"
)
args = parser.parse_args()
if args.command == "start_registry":
@ -55,8 +40,6 @@ def main():
heartbeat_interval=args.heartbeat_interval,
heartbeat_timeout=args.heartbeat_timeout,
)
elif args.command == "start_client":
start_client(host_ip=args.host_ip, host_port=args.host_port)
else:
parser.print_help()

View File

@ -1,57 +0,0 @@
import argparse
import asyncio
import signal
import threading
from http.server import HTTPServer, SimpleHTTPRequestHandler
import socketio
from .decorator import register_service
from .get_ip import get_ip_address
def start_client(host_ip="0.0.0.0", host_port=4999):
@register_service(
name="test client",
ip=get_ip_address(),
port=13373,
host_ip=host_ip,
host_port=host_port,
)
def server(port=13373):
httpd = HTTPServer(("", port), SimpleHTTPRequestHandler)
print(f"Serving HTTP on 0.0.0.0 port {port} (http://0.0.0.0:{port}/) ...")
def serve_forever_nonblocking():
httpd.serve_forever()
server_thread = threading.Thread(target=serve_forever_nonblocking)
server_thread.start()
return server_thread
try:
server_thread = server()
while True:
pass
except (KeyboardInterrupt, asyncio.exceptions.CancelledError):
print("Cleaning up and shutting down...")
# server_thread.join()
finally:
print("Shutting down test client...")
if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Start announce_server client.")
parser.add_argument(
"--host-ip",
type=str,
default="0.0.0.0",
help="Host IP address (default: 0.0.0.0)",
)
parser.add_argument(
"--host-port", type=int, default=4999, help="Host port number (default: 4999)"
)
args = parser.parse_args()
start_client(args.host_ip, args.host_port)

View File

@ -1,4 +1,3 @@
import argparse
import asyncio
import signal
@ -165,30 +164,9 @@ def start_server(address, port, heartbeat_interval, heartbeat_timeout):
if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Start announce_server client.")
parser.add_argument("--ip", default="0.0.0.0", help="IP address of the host server")
parser.add_argument(
"--port", default=4999, type=int, help="Port of the host server"
)
parser.add_argument(
"--heartbeat-interval",
default=5,
type=float,
help="Heartbeat interval in seconds",
)
parser.add_argument(
"--heartbeat-timeout",
default=3,
type=float,
help="Heartbeat timeout in seconds",
)
args = parser.parse_args()
start_server(
address=args.ip,
port=args.port,
heartbeat_interval=args.heartbeat_interval,
heartbeat_timeout=args.heartbeat_timeout,
address="0.0.0.0",
port=4999,
heartbeat_interval=5,
heartbeat_timeout=3,
)