diff --git a/CHANGELOG.md b/CHANGELOG.md index f817060d0419de6c2277285f1ede0a041b05567a..b9a171d8c2666edefe2e51120cb7fbad70a33b9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changes in version 4.?-?.?.? - 2017-??-?? + * Medium changes + - Only set the "running" field in a bridge's details document to + true if the bridge is both contained in the last known bridge + network status and has the "Running" flag assigned there. + * Minor changes - Remove placeholder page on index.html. diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 9fcff35e17c2bc216b6c1086f9b8091b34e0ea52..ff14d75813149c8ad65c26c1f7ffaa165c467bbb 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -863,7 +863,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } detailsStatus.setRelay(nodeStatus.isRelay()); - detailsStatus.setRunning(nodeStatus.getLastSeenMillis() + detailsStatus.setRunning(nodeStatus.getRelayFlags().contains("Running") + && nodeStatus.getLastSeenMillis() == (nodeStatus.isRelay() ? this.relaysLastValidAfterMillis : this.bridgesLastPublishedMillis)); detailsStatus.setNickname(nodeStatus.getNickname());