log tweaks

This commit is contained in:
zzz
2019-03-04 17:37:29 +00:00
parent f1ed870a4a
commit ad1600eb51

View File

@@ -49,7 +49,7 @@ class RepublishLeaseSetJob extends JobImpl {
if (ls != null) {
if (!ls.isCurrent(Router.CLOCK_FUDGE_FACTOR)) {
if (_log.shouldLog(Log.WARN))
_log.warn("Not publishing a LOCAL lease that isn't current - " + _dest, new Exception("Publish expired LOCAL lease?"));
_log.warn("Not publishing a LOCAL lease that isn't current - " + _dest.toBase32(), new Exception("Publish expired LOCAL lease?"));
} else {
if (_log.shouldLog(Log.INFO))
_log.info("Publishing " + ls);
@@ -60,7 +60,7 @@ class RepublishLeaseSetJob extends JobImpl {
}
} else {
if (_log.shouldLog(Log.WARN))
_log.warn("Client " + _dest + " is local, but we can't find a valid LeaseSet? perhaps its being rebuilt?");
_log.warn("Client " + _dest.toBase32() + " is local, but we can't find a valid LeaseSet? perhaps its being rebuilt?");
}
//if (false) { // floodfill doesnt require republishing
// long republishDelay = getContext().random().nextLong(2*REPUBLISH_LEASESET_DELAY);
@@ -69,7 +69,7 @@ class RepublishLeaseSetJob extends JobImpl {
return;
} else {
if (_log.shouldLog(Log.INFO))
_log.info("Client " + _dest + " is no longer local, so no more republishing their leaseSet");
_log.info("Client " + _dest.toBase32() + " is no longer local, so no more republishing their leaseSet");
}
_facade.stopPublishing(_dest);
} catch (RuntimeException re) {
@@ -82,7 +82,7 @@ class RepublishLeaseSetJob extends JobImpl {
void requeueRepublish() {
if (_log.shouldLog(Log.WARN))
_log.warn("FAILED publishing of the leaseSet for " + _dest);
_log.warn("FAILED publishing of the leaseSet for " + _dest.toBase32());
getContext().jobQueue().removeJob(this);
requeue(RETRY_DELAY + getContext().random().nextInt(RETRY_DELAY));
}
@@ -94,18 +94,6 @@ class RepublishLeaseSetJob extends JobImpl {
return _lastPublished;
}
/** TODO - does nothing, remove */
/****
private static class OnRepublishSuccess extends JobImpl {
public OnRepublishSuccess(RouterContext ctx) { super(ctx); }
public String getName() { return "Publish leaseSet successful"; }
public void runJob() {
//if (_log.shouldLog(Log.DEBUG))
// _log.debug("successful publishing of the leaseSet for " + _dest.toBase64());
}
}
****/
/** requeue */
private static class OnRepublishFailure extends JobImpl {
private final RepublishLeaseSetJob _job;