Skip to content

Commit 31116f4

Browse files
committed
Handle emitting capabilities in handshake
Remove superflous message handler
1 parent dbc7613 commit 31116f4

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

receptor/protocol.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ async def wait_greeting(self):
9797
self.transport.close()
9898
await asyncio.sleep(.1)
9999
logger.debug("handshake complete, starting normal handle loop")
100-
self.loop.create_task(self.connection.message_handler(self.incoming_buffer)) # Duplicated (see handle_handshake)?
101100

102101
def handle_handshake(self, data):
103102
self.greeted = True
@@ -110,6 +109,7 @@ def send_handshake(self):
110109
"cmd": "HI",
111110
"id": self.receptor.node_id,
112111
"expire_time": time.time() + 10,
112+
"capabilities": self.receptor.work_manager.get_capabilities(),
113113
}).encode("utf-8")
114114
self.transport.write(msg + DELIM)
115115

receptor/work.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ def load_receptor_worker(self, name):
1818
raise exceptions.UnknownDirective(f"Error loading directive handlers for {name}")
1919
return entry_points[0].load()
2020

21+
def get_capabilities(self):
22+
return [x.name for x in pkg_resources.iter_entry_points('receptor.worker')]
23+
2124
async def handle(self, inner_env):
2225
logger.info(f'Handling work for {inner_env.message_id} as {inner_env.directive}')
2326
namespace, action = inner_env.directive.split(':', 1)

0 commit comments

Comments
 (0)