Skip to content

Commit f39ec2a

Browse files
committed
fix test & nicer debug
1 parent dc017ba commit f39ec2a

2 files changed

Lines changed: 17 additions & 5 deletions

File tree

src/tomato/daemon/job.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,9 @@ def job_thread(
472472
context = zmq.Context()
473473
req = context.socket(zmq.REQ)
474474
req.connect(f"tcp://127.0.0.1:{driver.port}")
475-
lppargs = dict(endpoint=f"tcp://127.0.0.1:{driver.port}", context=context)
475+
lppargs = dict(
476+
endpoint=f"tcp://127.0.0.1:{driver.port}", context=context, sender=sender
477+
)
476478

477479
logger.info(f"job thread of {component.role!r} connected to tomato-daemon")
478480

src/tomato/daemon/lpp.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,18 @@
88

99

1010
def comm(
11-
req: zmq.Socket, data: Any, endpoint: str, context: zmq.Context, retries: int = 0
11+
req: zmq.Socket,
12+
data: Any,
13+
endpoint: str,
14+
context: zmq.Context,
15+
retries: int = 0,
16+
sender: str = None,
1217
) -> tuple[Reply, zmq.Socket]:
18+
if sender is None:
19+
logger = logging.getLogger(__name__)
20+
else:
21+
logger = logging.getLogger(f"{sender}.lpp")
22+
1323
req.send_pyobj(data)
1424

1525
while True:
@@ -21,15 +31,15 @@ def comm(
2131
req.setsockopt(zmq.LINGER, 0)
2232
req.close()
2333
if retries >= REQ_RETRIES:
24-
logging.error("Server '%s' offline, abandoning", endpoint)
34+
logger.error("Server '%s' offline, abandoning", endpoint)
2535
ret = Reply(
2636
success=False,
2737
msg=f"Server {endpoint!r} offline, abandoning",
2838
)
2939
break
3040
else:
31-
logging.warning("Server '%s' unavailable, retry %d", endpoint, retries)
41+
logger.warning("Server '%s' unavailable, retry %d", endpoint, retries)
3242
req = context.socket(zmq.REQ)
3343
req.connect(endpoint)
34-
req.send(data)
44+
req.send_pyobj(data)
3545
return ret, req

0 commit comments

Comments
 (0)