From bfb41de43b9a707459ec5f77144b2215767ecde0 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 3 Mar 2026 16:06:14 -0500 Subject: [PATCH] Further asyncio conversion work --- confluent_server/bin/collective | 2 +- confluent_server/bin/osdeploy | 4 ++-- confluent_server/confluent/certutil.py | 4 ++-- confluent_server/confluent/consoleserver.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/confluent_server/bin/collective b/confluent_server/bin/collective index 78eb83d0..ac899c54 100644 --- a/confluent_server/bin/collective +++ b/confluent_server/bin/collective @@ -162,4 +162,4 @@ async def main(): await delete_member(cmdset.name) if __name__ == '__main__': - asyncio.get_event_loop().run_until_complete(main()) + asyncio.run(main()) diff --git a/confluent_server/bin/osdeploy b/confluent_server/bin/osdeploy index c73a8089..9ca1a808 100644 --- a/confluent_server/bin/osdeploy +++ b/confluent_server/bin/osdeploy @@ -510,7 +510,7 @@ async def rebase(profilename): sys.exit(rsp['errorcode']) else: print(repr(rsp)) -/opt/confluent/bin/confluent + def oslist(): c = client.Command() print("Distributions:") @@ -598,4 +598,4 @@ async def osimport(imagefile, checkonly=False, custname=None): pass if __name__ == '__main__': - asyncio.get_event_loop().run_until_complete(main(sys.argv)) + asyncio.run(main(sys.argv)) diff --git a/confluent_server/confluent/certutil.py b/confluent_server/confluent/certutil.py index 27dd135c..9abb4de2 100644 --- a/confluent_server/confluent/certutil.py +++ b/confluent_server/confluent/certutil.py @@ -317,8 +317,8 @@ async def create_certificate(keyout=None, certout=None, csrfile=None, subj=None, subj = '/CN={0}'.format(subj) if not csrfile: await util.check_call( - ['openssl', 'ecparam', '-name', 'secp384r1', '-genkey', '-out', - keyout]) + 'openssl', 'ecparam', '-name', 'secp384r1', '-genkey', '-out', + keyout) permitdomains = [] if x509: # check if this CA has name constraints, and avoid violating them diff --git a/confluent_server/confluent/consoleserver.py b/confluent_server/confluent/consoleserver.py index c7e26331..0b77ba29 100644 --- a/confluent_server/confluent/consoleserver.py +++ b/confluent_server/confluent/consoleserver.py @@ -619,7 +619,7 @@ async def start_console_sessions(): await configmodule.hook_new_configmanagers(_start_tenant_sessions) -async def connect_node(node, configmanager, username=None, direct=True, width=80, +def connect_node(node, configmanager, username=None, direct=True, width=80, height=24): attrval = configmanager.get_node_attributes(node, 'collective.manager') myc = attrval.get(node, {}).get('collective.manager', {}).get(