Merge changes
Browse files
seamless_server/app_pubsub.py
CHANGED
|
@@ -125,7 +125,7 @@ class ServerLock(TypedDict):
|
|
| 125 |
|
| 126 |
MAX_SPEAKERS = os.environ.get("MAX_SPEAKERS")
|
| 127 |
|
| 128 |
-
if os.environ.get("LOCK_SERVER_COMPLETELY"):
|
| 129 |
logger.info("LOCK_SERVER_COMPLETELY is set. Server will be locked on startup.")
|
| 130 |
if MAX_SPEAKERS is not None:
|
| 131 |
logger.info(f"MAX_SPEAKERS is set to: {MAX_SPEAKERS}")
|
|
@@ -140,7 +140,7 @@ server_lock: Optional[ServerLock] = (
|
|
| 140 |
"client_id": "seamless_user",
|
| 141 |
"member_object": dummy_server_lock_member_object,
|
| 142 |
}
|
| 143 |
-
if os.environ.get("LOCK_SERVER_COMPLETELY")
|
| 144 |
else None
|
| 145 |
)
|
| 146 |
|
|
@@ -520,7 +520,7 @@ async def join_room(sid, client_id, room_id_from_client, config_dict):
|
|
| 520 |
and config_dict.get("lockServerName")
|
| 521 |
== ESCAPE_HATCH_SERVER_LOCK_RELEASE_NAME
|
| 522 |
# If we are locking the server completely we don't want someone to be able to unlock it
|
| 523 |
-
and not os.environ.get("LOCK_SERVER_COMPLETELY")
|
| 524 |
):
|
| 525 |
server_lock = None
|
| 526 |
logger.info(
|
|
|
|
| 125 |
|
| 126 |
MAX_SPEAKERS = os.environ.get("MAX_SPEAKERS")
|
| 127 |
|
| 128 |
+
if os.environ.get("LOCK_SERVER_COMPLETELY", "0") == "1":
|
| 129 |
logger.info("LOCK_SERVER_COMPLETELY is set. Server will be locked on startup.")
|
| 130 |
if MAX_SPEAKERS is not None:
|
| 131 |
logger.info(f"MAX_SPEAKERS is set to: {MAX_SPEAKERS}")
|
|
|
|
| 140 |
"client_id": "seamless_user",
|
| 141 |
"member_object": dummy_server_lock_member_object,
|
| 142 |
}
|
| 143 |
+
if os.environ.get("LOCK_SERVER_COMPLETELY", "0") == "1"
|
| 144 |
else None
|
| 145 |
)
|
| 146 |
|
|
|
|
| 520 |
and config_dict.get("lockServerName")
|
| 521 |
== ESCAPE_HATCH_SERVER_LOCK_RELEASE_NAME
|
| 522 |
# If we are locking the server completely we don't want someone to be able to unlock it
|
| 523 |
+
and not os.environ.get("LOCK_SERVER_COMPLETELY", "0") == "1"
|
| 524 |
):
|
| 525 |
server_lock = None
|
| 526 |
logger.info(
|