Skip to content
Snippets Groups Projects
Commit 679aa1c6 authored by Stefano Borini's avatar Stefano Borini
Browse files

Minor fixes for protocol

parent 640ebd15
No related branches found
No related tags found
1 merge request!79Deliver notification info
import errno import errno
import logging import logging
from traits.api import Any, List, Instance from traits.api import Any, List
from force_bdss.api import BaseNotificationListener from force_bdss.api import BaseNotificationListener
import zmq import zmq
from force_bdss.mco.events import BaseMCOEvent, MCOStartEvent, MCOFinishEvent, \ from force_bdss.mco.events import MCOStartEvent, MCOFinishEvent, \
MCOProgressEvent MCOProgressEvent
...@@ -51,14 +51,14 @@ class UINotification(BaseNotificationListener): ...@@ -51,14 +51,14 @@ class UINotification(BaseNotificationListener):
def _format_event(self, event): def _format_event(self, event):
if isinstance(event, MCOStartEvent): if isinstance(event, MCOStartEvent):
data = "MCO_START\n" data = "MCO_START"
elif isinstance(event, MCOFinishEvent): elif isinstance(event, MCOFinishEvent):
data = "MCO_FINISH\n" data = "MCO_FINISH"
elif isinstance(event, MCOProgressEvent): elif isinstance(event, MCOProgressEvent):
data = "MCO_PROGRESS\n{}\n{}\n".format( data = "MCO_PROGRESS\n{}\n{}".format(
" ".join([str(x) for x in event.input]), " ".join([str(x) for x in event.input]),
" ".join([str(x) for x in event.output])) " ".join([str(x) for x in event.output]))
else: else:
return None return None
return ("EVENT {}".format(data)).encode("utf-8") return ("EVENT\n{}".format(data)).encode("utf-8")
...@@ -11,10 +11,10 @@ send_socket.connect("tcp://localhost:12346") ...@@ -11,10 +11,10 @@ send_socket.connect("tcp://localhost:12346")
send_socket.send("SYNC".encode("utf-8")) send_socket.send("SYNC".encode("utf-8"))
data = send_socket.recv_multipart() data = send_socket.recv_multipart()
for d in data: for d in data:
split_data = d.split() split_data = d.decode("utf-8").split("\n")
print("SYNCED ", split_data) print("SYNCED ", split_data)
while True: while True:
string = socket.recv() string = socket.recv()
split_data = string.split() split_data = string.decode('utf-8').split("\n")
print(split_data) print(split_data)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment