commit 95ea86e2e907006bd4b9d8ccd53d8ccfa152fb1f Author: Damian Johnson <atagar@torproject.org> Date: Sun Apr 12 14:38:48 2015 -0700 Fix nyx log message deduplication The name shuffle missed our dedup.cfg, breaking deduplication of this type of message. --- nyx/config/dedup.cfg | 62 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/nyx/config/dedup.cfg b/nyx/config/dedup.cfg index ce8afcb..06c4ff2 100644 --- a/nyx/config/dedup.cfg +++ b/nyx/config/dedup.cfg @@ -47,17 +47,17 @@ # [WARN] Problem bootstrapping. Stuck at 80%: Connecting to the Tor network. # (Network is unreachable; NOROUTE; count 47; recommendation warn) # [WARN] 4 unknown, 1 missing key, 3 good, 0 bad, 1 no signature, 4 required -# [ARM_DEBUG] refresh rate: 0.001 seconds -# [ARM_DEBUG] proc call (process connections): /proc/net/[tcp|udp] (runtime: 0.0018) -# [ARM_DEBUG] system call: ps -p 2354 -o %cpu,rss,%mem,etime (runtime: 0.02) -# [ARM_DEBUG] system call: netstat -npt | grep 2354/tor (runtime: 0.02) -# [ARM_DEBUG] recreating panel 'graph' with the dimensions of 14/124 -# [ARM_DEBUG] redrawing the log panel with the corrected content height (estimat was off by 4) -# [ARM_DEBUG] GETINFO accounting/bytes-left (runtime: 0.0006) -# [ARM_DEBUG] GETINFO traffic/read (runtime: 0.0004) -# [ARM_DEBUG] GETINFO traffic/written (runtime: 0.0002) -# [ARM_DEBUG] GETCONF MyFamily (runtime: 0.0007) -# [ARM_DEBUG] Unable to query process resource usage from ps, waiting 6.25 seconds (unrecognized output from ps: ...) +# [NYX_DEBUG] refresh rate: 0.001 seconds +# [NYX_DEBUG] proc call (process connections): /proc/net/[tcp|udp] (runtime: 0.0018) +# [NYX_DEBUG] system call: ps -p 2354 -o %cpu,rss,%mem,etime (runtime: 0.02) +# [NYX_DEBUG] system call: netstat -npt | grep 2354/tor (runtime: 0.02) +# [NYX_DEBUG] recreating panel 'graph' with the dimensions of 14/124 +# [NYX_DEBUG] redrawing the log panel with the corrected content height (estimat was off by 4) +# [NYX_DEBUG] GETINFO accounting/bytes-left (runtime: 0.0006) +# [NYX_DEBUG] GETINFO traffic/read (runtime: 0.0004) +# [NYX_DEBUG] GETINFO traffic/written (runtime: 0.0002) +# [NYX_DEBUG] GETCONF MyFamily (runtime: 0.0007) +# [NYX_DEBUG] Unable to query process resource usage from ps, waiting 6.25 seconds (unrecognized output from ps: ...) # ################################################################################ @@ -84,24 +84,24 @@ dedup.WARN I have no descriptor for the router named dedup.WARN Controller gave us config lines that didn't validate dedup.WARN Problem bootstrapping. Stuck at dedup.WARN *missing key, -dedup.ARM_DEBUG refresh rate: -dedup.ARM_DEBUG proc call (cwd): -dedup.ARM_DEBUG proc call (memory usage): -dedup.ARM_DEBUG proc call (process command -dedup.ARM_DEBUG proc call (process utime -dedup.ARM_DEBUG proc call (process stime -dedup.ARM_DEBUG proc call (process start time -dedup.ARM_DEBUG proc call (process connections): -dedup.ARM_DEBUG system call: ps -dedup.ARM_DEBUG system call: netstat -dedup.ARM_DEBUG recreating panel ' -dedup.ARM_DEBUG redrawing the log panel with the corrected content height ( -dedup.ARM_DEBUG GETINFO accounting/bytes -dedup.ARM_DEBUG GETINFO accounting/bytes-left -dedup.ARM_DEBUG GETINFO accounting/interval-end -dedup.ARM_DEBUG GETINFO accounting/hibernating -dedup.ARM_DEBUG GETINFO traffic/read -dedup.ARM_DEBUG GETINFO traffic/written -dedup.ARM_DEBUG GETCONF -dedup.ARM_DEBUG Unable to query process resource usage from ps +dedup.NYX_DEBUG refresh rate: +dedup.NYX_DEBUG proc call (cwd): +dedup.NYX_DEBUG proc call (memory usage): +dedup.NYX_DEBUG proc call (process command +dedup.NYX_DEBUG proc call (process utime +dedup.NYX_DEBUG proc call (process stime +dedup.NYX_DEBUG proc call (process start time +dedup.NYX_DEBUG proc call (process connections): +dedup.NYX_DEBUG system call: ps +dedup.NYX_DEBUG system call: netstat +dedup.NYX_DEBUG recreating panel ' +dedup.NYX_DEBUG redrawing the log panel with the corrected content height ( +dedup.NYX_DEBUG GETINFO accounting/bytes +dedup.NYX_DEBUG GETINFO accounting/bytes-left +dedup.NYX_DEBUG GETINFO accounting/interval-end +dedup.NYX_DEBUG GETINFO accounting/hibernating +dedup.NYX_DEBUG GETINFO traffic/read +dedup.NYX_DEBUG GETINFO traffic/written +dedup.NYX_DEBUG GETCONF +dedup.NYX_DEBUG Unable to query process resource usage from ps