wip

Author: invisig0th

synapse/lib/aha.py

@@ -1024,15 +1024,6 @@ async def addAhaSvc(self, name, info, network=None):
         await self.fire('aha:svcadd', svcinfo=svcinfo)
         await self.fire(f'aha:svcadd:{svcfull}', svcinfo=svcinfo)
 
-    async def reqAhaSvcProxy(self, svcdef, timeout=None):
-
-        proxy = await self.getAhaSvcProxy(svcdef, timeout=timeout)
-        if proxy is not None:
-            return proxy
-
-        mesg = f'The service is not ready {svcdef.get("name")}.'
-        raise s_exc.NotReady(mesg=mesg)
-
     async def getAhaSvcProxy(self, svcdef, timeout=None):
 
         client = await self.getAhaSvcClient(svcdef)

synapse/lib/cell.py

@@ -4457,7 +4457,7 @@ async def callPeerApi(self, todo, timeout=None):
         Yield responses from our peers via the AHA gather call API.
         '''
         proxy = await self.getAhaProxy(timeout=timeout, feats=(feat_aha_callpeers_v1,))
-        if proxy is None:
+        if proxy is None: # pragma: no cover
             return
 
         async for item in proxy.callAhaPeerApi(self.iden, todo, timeout=timeout, skiprun=self.runid):
@@ -4468,7 +4468,7 @@ async def callPeerGenr(self, todo, timeout=None):
         Yield responses from invoking a generator via the AHA gather API.
         '''
         proxy = await self.getAhaProxy(timeout=timeout, feats=(feat_aha_callpeers_v1,))
-        if proxy is None:
+        if proxy is None: # pragma: no cover
             return
 
         async for item in proxy.callAhaPeerGenr(self.iden, todo, timeout=timeout, skiprun=self.runid):
@@ -4490,7 +4490,7 @@ async def getTasks(self, peers=True, timeout=None):
         # we can ignore the yielded aha names because we embed it in the task
         async for (ahasvc, (ok, retn)) in self.callPeerGenr(todo, timeout=timeout):
 
-            if not ok:
+            if not ok: # pragma: no cover
                 logger.warning(f'getTasks() on {ahasvc} failed: {retn}')
                 continue
 
@@ -4510,7 +4510,7 @@ async def getTask(self, iden, peers=True, timeout=None):
         todo = s_common.todo('getTask', iden, peers=False, timeout=timeout)
         async for ahasvc, (ok, retn) in self.callPeerApi(todo, timeout=timeout):
 
-            if not ok:
+            if not ok: # pragma: no cover
                 logger.warning(f'getTask() on {ahasvc} failed: {retn}')
                 continue
 
@@ -4530,7 +4530,7 @@ async def killTask(self, iden, peers=True, timeout=None):
         todo = s_common.todo('killTask', iden, peers=False, timeout=timeout)
         async for ahasvc, (ok, retn) in self.callPeerApi(todo, timeout=timeout):
 
-            if not ok:
+            if not ok: # pragma: no cover
                 logger.warning(f'killTask() on {ahasvc} failed: {retn}')
                 continue