Skip to content
Open
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,9 @@ private MessageReply createTimeoutReply(NeedReplyMessage m) {
public FutureCompletion send(NeedReplyMessage msg, CloudBusCallBack callback) {
evaluateMessageTimeout(msg);
if (msg.getTimeout() <= 1) {
logger.warn(String.format("message timeout too short, rejecting: msg=%s, id=%s, timeout=%d, deadline=%d, serviceId=%s",
msg.getClass().getSimpleName(), msg.getId(), msg.getTimeout(), msg.getMessageDeadline(),
msg.getServiceId()));
callback.run(createTimeoutReply(msg));
return SEND_CONFIRMED;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,21 @@ public void setMessageTimeout(Message msg) {
} else if (msg instanceof NeedReplyMessage) {
NeedReplyMessage nmsg = (NeedReplyMessage) msg;
if (nmsg.getTimeout() == -1) {
MessageTimeoutDsc mtd = evalTimeout(getMessageTimeout());
long resolvedTimeout = getMessageTimeout();
MessageTimeoutDsc mtd = evalTimeout(resolvedTimeout);
nmsg.setTimeout(mtd.getMessageTimeout());
nmsg.setMessageDeadline(mtd.getMessageDeadline());

if (logger.isTraceEnabled()) {
Map<Object, Object> tc = TaskContext.getTaskContext();
logger.trace(String.format("setMessageTimeout: msg=%s, getMessageTimeout()=%d, " +
"evalResult=[timeout=%d, deadline=%d], taskContext=%s, currentTime=%d, thread=%s",
msg.getClass().getSimpleName(), resolvedTimeout,
mtd.getMessageTimeout(), mtd.getMessageDeadline(),
tc != null ? tc.toString() : "null",
timer.getCurrentTimeMillis(),
Thread.currentThread().getName()));
}
}
}
}
Expand Down