Commit d37fd3c7 authored by Andre Freyssinet's avatar Andre Freyssinet

Adds agent identifier in heartbeat task logging message.

parent 7db2748f
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2001 - 2020 ScalAgent Distributed Technologies
* Copyright (C) 2001 - 2021 ScalAgent Distributed Technologies
* Copyright (C) 2004 France Telecom R&D
* Copyright (C) 2003 - 2004 Bull SA
* Copyright (C) 1996 - 2000 Dyade
......@@ -1024,12 +1024,12 @@ public final class UserAgent extends Agent implements UserAgentMBean, ProxyAgent
public void run() {
if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, "HeartBeatTask: run - key=" + key);
logger.log(BasicLevel.DEBUG, "HeartBeatTask: " + userId + " run - key=" + key);
long date = System.currentTimeMillis();
if ((date - lastRequestDate) > timeout) {
if (logger.isLoggable(BasicLevel.WARN))
logger.log(BasicLevel.WARN, "HeartBeatTask: close connection - key=" + key);
logger.log(BasicLevel.WARN, "HeartBeatTask: " + userId + " close connection - key=" + key);
Channel.sendTo(userId, (Notification) new CloseConnectionNot2(key.intValue()));
this.cancel();
......@@ -2764,8 +2764,7 @@ public final class UserAgent extends Agent implements UserAgentMBean, ProxyAgent
if (!req.getAsyncSend()) {
if (! callbackNotification.hasCallback()) {
if (asyncReplyCount == 0) {
sendNot(getId(), new SendReplyNot(key, req
.getRequestId()));
sendNot(getId(), new SendReplyNot(key, req.getRequestId()));
} else {
// we need to wait for the replies
// from the local agents
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment