synapse 2.208.0__py311-none-any.whl → 2.210.0__py311-none-any.whl

synapse/tests/test_telepath.py

@@ -1,16 +1,16 @@
 import os
 import ssl
+import sys
 import socket
 import asyncio
 import logging
-import threading
+import multiprocessing
 
 from unittest import mock
 
 import cryptography.hazmat.primitives.hashes as c_hashes
 
 import synapse.exc as s_exc
-import synapse.glob as s_glob
 import synapse.common as s_common
 import synapse.daemon as s_daemon
 import synapse.telepath as s_telepath
@@ -189,6 +189,40 @@ class TeleAuth(s_telepath.Aware):
     def getFooBar(self, x, y):
         return x + y
 
+def run_telepath_sync_genr_break(url: str,
+                      evt1: multiprocessing.Event,
+                      evt2: multiprocessing.Event,):
+    '''
+    This is a Process target.
+    '''
+    with s_telepath.openurl(url) as prox:
+        form = 'test:int'
+
+        q = '[' + ' '.join([f'{form}={i}' for i in range(10)]) + ' ]'
+
+        # This puts a link into the link pool
+        emesg = 12
+        msgs = list(prox.storm(q, opts={'show': ('node', 'nodeedits')}))
+        assert len(msgs) == emesg, f'Got {len(msgs)} messages, expected {emesg}'
+
+        # Get the link from the pool, add the fini callback and put it back
+        # This involves reaching into the proxy internals to do so.
+        link = prox.links.popleft()
+        link.onfini(evt1.set)
+        prox.links.append(link)
+
+        # Break from the generator right away, causing a
+        # GeneratorExit in the GenrHelp object __iter__ method.
+        mesg = None
+        for mesg in prox.storm(q):
+            break
+        # Ensure the query did yield an object
+        assert mesg is not None, 'mesg was not recieved!'
+        assert link.isfini is True, 'link.fini was not set to true'
+
+        evt2.set()
+        sys.exit(137)
+
 class TeleTest(s_t_utils.SynTest):
 
     async def test_telepath_basics(self):
@@ -296,47 +330,20 @@ class TeleTest(s_t_utils.SynTest):
             async with await s_telepath.openurl('tcp://127.0.0.1/foo', port=dmon.addr[1]) as prox:
                 self.eq((10, 20, 30), await s_coro.executor(sync))
 
-    def test_telepath_sync_genr_break(self):
-
-        try:
-            acm = self.getTestCoreAndProxy()
-            core, proxy = s_glob.sync(acm.__aenter__())
-
-            form = 'test:int'
-
-            q = '[' + ' '.join([f'{form}={i}' for i in range(10)]) + ' ]'
-
-            # This puts a link into the link pool
-            msgs = list(proxy.storm(q, opts={'show': ('node',)}))
-            self.len(12, msgs)
+    async def test_telepath_sync_genr_break(self):
+        async with self.getTestCore() as core:
+            url = core.getLocalUrl()
 
-            evt = threading.Event()
+            ctx = multiprocessing.get_context('spawn')
+            evt1 = ctx.Event()
+            evt2 = ctx.Event()
+            proc = ctx.Process(target=run_telepath_sync_genr_break, args=(url, evt1, evt2))
+            proc.start()
 
-            # Get the link from the pool, add the fini callback and put it back
-            link = s_glob.sync(proxy.getPoolLink())
-            link.onfini(evt.set)
-            s_glob.sync(proxy._putPoolLink(link))
-
-            # Grab the fresh link from the pool so our original link is up next again
-            link2 = s_glob.sync(proxy.getPoolLink())
-            s_glob.sync(proxy._putPoolLink(link2))
-
-            q = f'{form} | sleep 0.1'
-
-            # Break from the generator right away, causing a
-            # GeneratorExit in the GenrHelp object __iter__ method.
-            mesg = None
-            for mesg in proxy.storm(q):
-                break
-            # Ensure the query did yield an object
-            self.nn(mesg)
-
-            # Ensure the link we have a reference too was torn down
-            self.true(evt.wait(4))
-            self.true(link.isfini)
-
-        finally:
-            s_glob.sync(acm.__aexit__(None, None, None))
+            self.true(await s_coro.executor(evt1.wait, timeout=30))
+            self.true(await s_coro.executor(evt2.wait, timeout=30))
+            proc.join(timeout=30)
+            self.eq(proc.exitcode, 137)
 
     async def test_telepath_no_sess(self):
 
@@ -1016,6 +1023,10 @@ class TeleTest(s_t_utils.SynTest):
                 self.len(1, await wait.wait(timeout=5))
                 self.len(12, prox.links)
 
+                # Cleanup our global state
+                prox2._all_proxies.remove(prox2)
+                await prox.fini()
+
     async def test_link_fini_breaking_tasks(self):
         foo = Foo()
 

synapse/tests/test_tools_aha.py

@@ -38,7 +38,7 @@ class AhaToolsTest(s_t_utils.SynTest):
                     self.true(await waiter.wait(timeout=6))
 
                     argv = [ahaurl]
-                    retn, outp = await self.execToolMain(s_a_list._main, argv)
+                    retn, outp = await self.execToolMain(s_a_list.main, argv)
                     self.eq(retn, 0)
 
                     outp.expect('''
@@ -48,7 +48,7 @@ class AhaToolsTest(s_t_utils.SynTest):
                     ''', whitespace=False)
 
                     argv = [ahaurl, 'demo.net']
-                    retn, outp = await self.execToolMain(s_a_list._main, argv)
+                    retn, outp = await self.execToolMain(s_a_list.main, argv)
                     self.eq(retn, 0)
                     outp.expect('Service              network', whitespace=False)
                     outp.expect('cell0                demo.net', whitespace=False)
@@ -56,7 +56,7 @@ class AhaToolsTest(s_t_utils.SynTest):
         async with self.getTestCore() as core:
             curl = core.getLocalUrl()
             argv = [curl]
-            retn, outp = await self.execToolMain(s_a_list._main, argv)
+            retn, outp = await self.execToolMain(s_a_list.main, argv)
             self.eq(1, retn)
             outp.expect(f'Service at {curl} is not an Aha server')
 
@@ -67,18 +67,17 @@ class AhaToolsTest(s_t_utils.SynTest):
                                          'dmon:listen': ephemeral_address}) as aha:
             _, port = aha.sockaddr
             ahaurl = f'tcp://root:root@127.0.0.1:{port}'
-
-            with self.getTestDir() as dirn:
+            with self.getTestSynDir() as syndir, self.getTestDir() as dirn:
                 argvbase = ['-a', ahaurl, '--certdir', dirn]
                 argv = argvbase + ['--ca', 'demo.net']
-                retn, outp = await self.execToolMain(s_a_easycert._main, argv)
+                retn, outp = await self.execToolMain(s_a_easycert.main, argv)
                 self.eq(retn, 0)
                 outp.expect('Saved CA cert')
                 outp.expect('cas/demo.net.crt')
 
                 argv = argvbase + ['--server', '--server-sans', 'DNS:beeper.demo.net,DNS:booper.demo.net',
                                    '--network', 'demo.net', 'beep.demo.net']
-                retn, outp = await self.execToolMain(s_a_easycert._main, argv)
+                retn, outp = await self.execToolMain(s_a_easycert.main, argv)
                 self.eq(retn, 0)
                 outp.expect('key saved')
                 outp.expect('hosts/beep.demo.net.key')
@@ -86,7 +85,7 @@ class AhaToolsTest(s_t_utils.SynTest):
                 outp.expect('hosts/beep.demo.net.crt')
 
                 argv = argvbase + ['--network', 'demo.net', 'mallory@demo.net']
-                retn, outp = await self.execToolMain(s_a_easycert._main, argv)
+                retn, outp = await self.execToolMain(s_a_easycert.main, argv)
                 self.eq(retn, 0)
                 outp.expect('key saved')
                 outp.expect('users/mallory@demo.net.key')

synapse/tests/utils.py

@@ -864,7 +864,7 @@ class HttpReflector(s_httpapi.Handler):
             for k, items in self.request.arguments.items():
                 for v in items:
                     d[k].append(v.decode())
-        return d
+        return dict(d)
 
     async def get(self):
         resp = {}

synapse/tools/aha/clone.py

@@ -5,6 +5,7 @@ import argparse
 import synapse.exc as s_exc
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 descr = '''
@@ -48,5 +49,10 @@ async def main(argv, outp=s_output.stdout):
             outp.printf(f'ERROR: {mesg}')
             return 1
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/easycert.py

@@ -8,13 +8,14 @@ import cryptography.x509 as c_x509
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.certdir as s_certdir
 
 
 logger = logging.getLogger(__name__)
 
-async def _main(argv, outp):
+async def main(argv, outp=s_output.stdout):
     pars = getArgParser()
     opts = pars.parse_args(argv)
 
@@ -22,36 +23,36 @@ async def _main(argv, outp):
         s_common.deprecated('--network option.', curv='v2.206.0')
 
     cdir = s_certdir.CertDir(path=opts.certdir)
-
-    async with await s_telepath.openurl(opts.aha) as prox:
-
-        name = opts.name
-
-        if opts.ca:
-            # A User may only have get permissions; so try get first
-            # before attempting to generate a new CA.
-            certbyts = await prox.getCaCert(name)
-            if not certbyts:
-                s_common.deprecated('AHA CA certificate generation.', curv='v2.206.0')
-                certbyts = await prox.genCaCert(name)
-            cert = c_x509.load_pem_x509_certificate(certbyts.encode())
-            path = cdir._saveCertTo(cert, 'cas', f'{name}.crt')
-            outp.printf(f'Saved CA cert to {path}')
-            return 0
-        elif opts.server:
-            csr = cdir.genHostCsr(name, outp=outp)
-            certbyts = await prox.signHostCsr(csr.decode(), signas=opts.network, sans=opts.server_sans)
-            cert = c_x509.load_pem_x509_certificate(certbyts.encode())
-            path = cdir._saveCertTo(cert, 'hosts', f'{name}.crt')
-            outp.printf(f'crt saved: {path}')
-            return 0
-        else:
-            csr = cdir.genUserCsr(name, outp=outp)
-            certbyts = await prox.signUserCsr(csr.decode(), signas=opts.network)
-            cert = c_x509.load_pem_x509_certificate(certbyts.encode())
-            path = cdir._saveCertTo(cert, 'users', f'{name}.crt')
-            outp.printf(f'crt saved: {path}')
-            return 0
+    async with s_telepath.withTeleEnv():
+        async with await s_telepath.openurl(opts.aha) as prox:
+
+            name = opts.name
+
+            if opts.ca:
+                # A User may only have get permissions; so try get first
+                # before attempting to generate a new CA.
+                certbyts = await prox.getCaCert(name)
+                if not certbyts:
+                    s_common.deprecated('AHA CA certificate generation.', curv='v2.206.0')
+                    certbyts = await prox.genCaCert(name)
+                cert = c_x509.load_pem_x509_certificate(certbyts.encode())
+                path = cdir._saveCertTo(cert, 'cas', f'{name}.crt')
+                outp.printf(f'Saved CA cert to {path}')
+                return 0
+            elif opts.server:
+                csr = cdir.genHostCsr(name, outp=outp)
+                certbyts = await prox.signHostCsr(csr.decode(), signas=opts.network, sans=opts.server_sans)
+                cert = c_x509.load_pem_x509_certificate(certbyts.encode())
+                path = cdir._saveCertTo(cert, 'hosts', f'{name}.crt')
+                outp.printf(f'crt saved: {path}')
+                return 0
+            else:
+                csr = cdir.genUserCsr(name, outp=outp)
+                certbyts = await prox.signUserCsr(csr.decode(), signas=opts.network)
+                cert = c_x509.load_pem_x509_certificate(certbyts.encode())
+                path = cdir._saveCertTo(cert, 'users', f'{name}.crt')
+                outp.printf(f'crt saved: {path}')
+                return 0
 
 def getArgParser():
     desc = 'CLI tool to generate simple x509 certificates from an Aha server.'
@@ -74,17 +75,11 @@ def getArgParser():
 
     return pars
 
-async def main(argv, outp=None):  # pragma: no cover
-
-    if outp is None:
-        outp = s_output.stdout
-
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
     s_common.setlogging(logger, 'WARNING')
-
-    async with s_telepath.withTeleEnv():
-        await _main(argv, outp)
-
-    return 0
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
 
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/enroll.py

@@ -6,6 +6,7 @@ import argparse
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.certdir as s_certdir
 import synapse.lib.msgpack as s_msgpack
@@ -99,5 +100,10 @@ async def main(argv, outp=s_output.stdout):
 
     return 0
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/list.py

@@ -1,12 +1,12 @@
 import sys
 import asyncio
 import logging
-import contextlib
 
 import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
 
@@ -14,76 +14,71 @@ logger = logging.getLogger(__name__)
 
 reqver = '>=2.11.0,<3.0.0'
 
-async def _main(argv, outp):
-
-    async with await s_telepath.openurl(argv[0]) as prox:
-        try:
-            s_version.reqVersion(prox._getSynVers(), reqver)
-        except s_exc.BadVersion as e:  # pragma: no cover
-            valu = s_version.fmtVersion(*e.get('valu'))
-            outp.printf(f'Proxy version {valu} is outside of the aha supported range ({reqver}).')
-            return 1
-        classes = prox._getClasses()
-        if 'synapse.lib.aha.AhaApi' not in classes:
-            outp.printf(f'Service at {argv[0]} is not an Aha server')
-            return 1
-
-        try:
-            network = argv[1]
-        except IndexError:
-            network = None
-
-        mesg = f"{'Service':<20s} {'network':<30s} {'leader':<6} {'online':<6} {'scheme':<6} {'host':<20} {'port':<5}  connection opts"
-        outp.printf(mesg)
-
-        svcs = []
-        ldrs = set()
-        async for svc in prox.getAhaSvcs(network):
-            svcinfo = svc.get('svcinfo')
-            if svcinfo and svc.get('svcname') == svcinfo.get('leader'):
-                ldrs.add(svcinfo.get('run'))
-            svcs.append(svc)
-
-        for svc in svcs:
-            svcname = svc.pop('svcname')
-            svcnetw = svc.pop('svcnetw')
-
-            svcinfo = svc.pop('svcinfo')
-            urlinfo = svcinfo.pop('urlinfo')
-            online = str(bool(svcinfo.pop('online', False)))
-            host = urlinfo.pop('host')
-            port = str(urlinfo.pop('port'))
-            scheme = urlinfo.pop('scheme')
-
-            leader = 'None'
-            if svcinfo.get('leader') is not None:
-                if svcinfo.get('run') in ldrs:
-                    leader = 'True'
-                else:
-                    leader = 'False'
-
-            mesg = f'{svcname:<20s} {svcnetw:<30s} {leader:<6} {online:<6} {scheme:<6} {host:<20} {port:<5}'
-            if svc:
-                mesg = f'{mesg}  {svc}'
-
-            outp.printf(mesg)
-        return 0
-
-async def main(argv, outp=None):  # pragma: no cover
-
-    if outp is None:
-        outp = s_output.stdout
+async def main(argv, outp=s_output.stdout):
 
     if len(argv) not in (1, 2):
         outp.printf('usage: python -m synapse.tools.aha.list <url> [network name]')
         return 1
 
-    s_common.setlogging(logger, 'WARNING')
-
     async with s_telepath.withTeleEnv():
-        await _main(argv, outp)
+        async with await s_telepath.openurl(argv[0]) as prox:
+            try:
+                s_version.reqVersion(prox._getSynVers(), reqver)
+            except s_exc.BadVersion as e:  # pragma: no cover
+                valu = s_version.fmtVersion(*e.get('valu'))
+                outp.printf(f'Proxy version {valu} is outside of the aha supported range ({reqver}).')
+                return 1
+            classes = prox._getClasses()
+            if 'synapse.lib.aha.AhaApi' not in classes:
+                outp.printf(f'Service at {argv[0]} is not an Aha server')
+                return 1
+
+            try:
+                network = argv[1]
+            except IndexError:
+                network = None
+
+            mesg = f"{'Service':<20s} {'network':<30s} {'leader':<6} {'online':<6} {'scheme':<6} {'host':<20} {'port':<5}  connection opts"
+            outp.printf(mesg)
 
-    return 0
+            svcs = []
+            ldrs = set()
+            async for svc in prox.getAhaSvcs(network):
+                svcinfo = svc.get('svcinfo')
+                if svcinfo and svc.get('svcname') == svcinfo.get('leader'):
+                    ldrs.add(svcinfo.get('run'))
+                svcs.append(svc)
+
+            for svc in svcs:
+                svcname = svc.pop('svcname')
+                svcnetw = svc.pop('svcnetw')
+
+                svcinfo = svc.pop('svcinfo')
+                urlinfo = svcinfo.pop('urlinfo')
+                online = str(bool(svcinfo.pop('online', False)))
+                host = urlinfo.pop('host')
+                port = str(urlinfo.pop('port'))
+                scheme = urlinfo.pop('scheme')
+
+                leader = 'None'
+                if svcinfo.get('leader') is not None:
+                    if svcinfo.get('run') in ldrs:
+                        leader = 'True'
+                    else:
+                        leader = 'False'
+
+                mesg = f'{svcname:<20s} {svcnetw:<30s} {leader:<6} {online:<6} {scheme:<6} {host:<20} {port:<5}'
+                if svc:
+                    mesg = f'{mesg}  {svc}'
+
+                outp.printf(mesg)
+            return 0
+
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    s_common.setlogging(logger, 'WARNING')
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
 
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/mirror.py

@@ -6,6 +6,7 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
 
@@ -191,5 +192,10 @@ async def main(argv, outp=s_output.stdout):
             outp.printf(f'ERROR: {mesg}')
             return 1
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/provision/service.py

@@ -6,6 +6,7 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 descr = '''
@@ -78,5 +79,10 @@ async def main(argv, outp=s_output.stdout):
             outp.printf(f'ERROR: {mesg}')
             return 1
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/aha/provision/user.py

@@ -5,6 +5,7 @@ import argparse
 import synapse.exc as s_exc
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 descr = '''
@@ -49,5 +50,10 @@ async def main(argv, outp=s_output.stdout):
             outp.printf(f'ERROR: {mesg}')
             return 1
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/apikey.py

@@ -5,6 +5,7 @@ import argparse
 import synapse.exc as s_exc
 import synapse.telepath as s_telepath
 
+import synapse.lib.coro as s_coro
 import synapse.lib.time as s_time
 import synapse.lib.output as s_output
 
@@ -89,5 +90,11 @@ async def main(argv, outp=s_output.stdout):
 
     return 0
 
+
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/axon2axon.py

@@ -8,6 +8,7 @@ import synapse.telepath as s_telepath
 import synapse.exc as s_exc
 import synapse.lib.cmd as s_cmd
 import synapse.lib.base as s_base
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 
 logger = logging.getLogger(__name__)
@@ -42,5 +43,10 @@ async def main(argv, outp=s_output.stdout):
                     await fd.save()
     return 0
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(main(sys.argv[1:])))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/cellauth.py

@@ -1,4 +1,3 @@
-import os
 import sys
 import asyncio
 import logging
@@ -7,10 +6,10 @@ import traceback
 import synapse.exc as s_exc
 import synapse.common as s_common
 
-import synapse.glob as s_glob
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmd as s_cmd
+import synapse.lib.coro as s_coro
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
 
@@ -338,9 +337,11 @@ def makeargparser():
     pars_mod.set_defaults(func=handleModify)
     return pars
 
-async def _main():  # pragma: no cover
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
     s_common.setlogging(logger, 'DEBUG')
-    return await main(sys.argv[1:])
+    ret = await main(argv, outprint=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
 
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(s_glob.sync(_main()))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))

synapse/tools/cmdr.py

@@ -9,6 +9,7 @@ import synapse.common as s_common
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmdr as s_cmdr
+import synapse.lib.coro as s_coro
 import synapse.lib.version as s_version
 
 logger = logging.getLogger(__name__)
@@ -51,7 +52,7 @@ async def main(argv):  # pragma: no cover
 
     async with s_telepath.withTeleEnv():
         await _main(argv)
-
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
     return 0
 
 if __name__ == '__main__':  # pragma: no cover

synapse/tools/csvtool.py

@@ -9,8 +9,8 @@ import synapse.common as s_common
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmd as s_cmd
-import synapse.lib.base as s_base
 import synapse.lib.cmdr as s_cmdr
+import synapse.lib.coro as s_coro
 import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
@@ -235,5 +235,10 @@ def makeargparser(outp):
     pars.add_argument('csvfiles', nargs='+', help='CSV files to load.')
     return pars
 
+async def _main(argv, outp=s_output.stdout):  # pragma: no cover
+    ret = await main(argv, outp=outp)
+    await asyncio.wait_for(s_coro.await_bg_tasks(), timeout=60)
+    return ret
+
 if __name__ == '__main__':  # pragma: no cover
-    sys.exit(asyncio.run(s_base.main(main(sys.argv[1:]))))
+    sys.exit(asyncio.run(_main(sys.argv[1:])))