cli: Added 'server delete' command

Author: defnull

bbblb/cli/server.py

@@ -80,7 +80,7 @@ async def enable(obj: ServiceRegistry, domain: str):
 )
 @async_command()
 async def disable(obj: ServiceRegistry, domain: str, nuke: bool, wait: int):
-    """Disable a server, so now new meetings are created on it."""
+    """Disable a server and wait for meetings to end."""
     db = await obj.use(DBContext)
 
     async with db.session() as session:
@@ -134,6 +134,33 @@ async def disable(obj: ServiceRegistry, domain: str, nuke: bool, wait: int):
             await asyncio.sleep(interval)
 
 
+@server.command("delete")
+@click.argument("domain")
+@async_command()
+async def _delete(obj: ServiceRegistry, domain: str):
+    """Remove an empty server from the server list."""
+    db = await obj.use(DBContext)
+    async with db.session() as session:
+        server = (
+            await session.execute(model.Server.select(domain=domain))
+        ).scalar_one_or_none()
+        if not server:
+            click.echo(f"Server {domain!r} not found")
+            return
+        if server.enabled:
+            click.echo(f"Server {domain!r} not disabled")
+        stmt = (
+            model.Meeting.select(model.Meeting.server == server)
+            .with_only_columns(func.count())
+            .order_by(None)
+        )
+        if (await session.execute(stmt)).scalar() or 0 > 0:
+            click.echo(f"Server {domain!r} not empty")
+            return
+        await session.delete(server)
+    click.echo(f"Server {domain!r} removed")
+
+
 async def _end_meeting(obj: ServiceRegistry, meeting: model.Meeting):
     server = await meeting.awaitable_attrs.server
     tenant = await meeting.awaitable_attrs.server

docs/_click.rst

@@ -297,15 +297,16 @@ Manage servers
 .. table:: Sub-Commands
   :width: 100%
 
-  =======  ========================================================
-  Command  Help                                                    
-  =======  ========================================================
-  create   Create a new server or update a server secret.          
-  enable   Enable a server and make it available for new meetings. 
-  disable  Disable a server, so now new meetings are created on it.
-  list     List all servers with their secrets.                    
-  stats    Show server statistics (state, health, load).           
-  =======  ========================================================
+  =======  =======================================================
+  Command  Help                                                   
+  =======  =======================================================
+  create   Create a new server or update a server secret.         
+  enable   Enable a server and make it available for new meetings.
+  disable  Disable a server and wait for meetings to end.         
+  delete   Remove an empty server from the server list.           
+  list     List all servers with their secrets.                   
+  stats    Show server statistics (state, health, load).          
+  =======  =======================================================
 
 server create
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -346,7 +347,7 @@ server disable
 
 ``Usage: bbblb server disable [OPTIONS] DOMAIN``
 
-Disable a server, so now new meetings are created on it.
+Disable a server and wait for meetings to end.
 
 .. table:: Options
   :width: 100%
@@ -359,6 +360,22 @@ Disable a server, so now new meetings are created on it.
   --wait INTEGER  Wait for this many seconds for all meetings to end. A value of -1 waits forever  [default: 0]
   ==============  =============================================================================================
 
+server delete
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Usage: bbblb server delete [OPTIONS] DOMAIN``
+
+Remove an empty server from the server list.
+
+.. table:: Options
+  :width: 100%
+
+  ======  =================
+  Option  Help             
+  ======  =================
+  DOMAIN  Required argument
+  ======  =================
+
 server list
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~