diff --git a/main.py b/main.py index b2dcd61..fd936ce 100644 --- a/main.py +++ b/main.py @@ -44,7 +44,8 @@ async def on_room_changed(new_room_ids): TEST_ROOM_IDS = list(set(new_room_ids + room_from_config())) for removed in clients.keys() - TEST_ROOM_IDS: - await clients[removed].stop_and_close() + print(f"room {removed} removed") + clients[removed].stop_and_close() del clients[removed] if removed in log_files: diff --git a/redis_util.py b/redis_util.py index d8602c6..896d16f 100644 --- a/redis_util.py +++ b/redis_util.py @@ -9,7 +9,7 @@ r: redis.Redis | None = None on_room_changed: Callable[[list[int]], Awaitable[None]] | None = None -async def init(redis_conf: dict | None) -> None: +def init(redis_conf: dict | None) -> None: global r if redis_conf is None: @@ -31,13 +31,6 @@ def get_room_list() -> list[int]: return [int(room_id) for room_id in r.smembers(room_set_key)] -def _subscribe_redis(): - loop = asyncio.new_event_loop() - asyncio.set_event_loop(loop) - loop.run_until_complete(_subscribe_redis_async()) - loop.close() - - async def _subscribe_redis_async(): p = r.pubsub() p.subscribe(f"__keyspace@0__:{room_set_key}")