Skip to content
This repository has been archived by the owner on Dec 15, 2020. It is now read-only.

initial fix for having emitters on objects #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/zocp.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,13 @@ def emit_signal(self, emitter, data):
Update the value of the emitter and signal all subscribed receivers

Arguments are:
* emitter: name of the emitting capability
* emitter: list of names of the keys to emitting capability
* data: value
"""
self.capability[emitter]['value'] = data
if isinstance(emitter, str):
self.capability[emitter]['value'] = data
else:
dict_set(emitter + ('value',), data)
msg = json.dumps({'SIG': [emitter, data]})

for subscriber in self.subscribers:
Expand Down Expand Up @@ -773,8 +776,17 @@ def _handle_MOD(self, data, peer, name, grp):

def _handle_SIG(self, data, peer, name, grp):
[emitter, value] = data
if emitter in self.peers_capabilities[peer]:
self.peers_capabilities[peer][emitter].update({'value': value})
if isinstance(emitter, str):
if emitter in self.peers_capabilities[peer]:
self.peers_capabilities[peer][emitter].update({'value': value})
else:
try:
emit = dict_get(self.peers_capabilities[peer], emitter)
except KeyError:
logger.debug("_handle_SIG emitter {0} not found".format(emitter))
return
else:
emit.update({'value': value})

if peer in self.subscriptions:
subscription = self.subscriptions[peer]
Expand Down