log tweaks

This commit is contained in:
zzz
2011-03-23 02:22:19 +00:00
parent 7e0d0e2b01
commit c85931cbc5
4 changed files with 13 additions and 11 deletions

View File

@ -126,10 +126,11 @@ public class Daemon {
long start = System.currentTimeMillis();
AddressBook sub = iter.next();
long end = System.currentTimeMillis();
if (DEBUG && log != null)
// SubscriptionIterator puts in a dummy AddressBook with no location if no fetch is done
if (DEBUG && log != null && sub.getLocation() != null)
log.append("Fetch of " + sub.getLocation() + " took " + (end - start));
start = end;
int old = 0, nnew = 0, invalid = 0, conflict = 0;
int old = 0, nnew = 0, invalid = 0, conflict = 0, total = 0;
for (Iterator<Map.Entry<String, String>> eIter = sub.iterator(); eIter.hasNext(); ) {
Map.Entry<String, String> entry = eIter.next();
String key = entry.getKey();
@ -197,10 +198,12 @@ public class Daemon {
log.append("Invalid b64 for" + key + " From: " + sub.getLocation());
invalid++;
}
total++;
}
if (DEBUG && log != null) {
if (DEBUG && log != null && total > 0) {
log.append("Merge of " + sub.getLocation() + " into " + router +
" took " + (System.currentTimeMillis() - start) + " ms with " +
total + " total, " +
nnew + " new, " +
old + " old, " +
invalid + " invalid, " +

View File

@ -66,6 +66,7 @@ class DaemonThread extends Thread implements NamingServiceUpdater {
/**
* The NamingServiceUpdater interface
* @param options ignored
* @since 0.8.6
*/
public void update(Properties options) {