commit 574a3ec4c60bd205d97720308d21f1c2f3e1853c Author: iwakeh iwakeh@torproject.org Date: Mon Mar 26 11:01:56 2018 +0000

Adapt to metrics-lib 2.3.0 changes.

This concerns #25523. --- CHANGELOG.md | 6 ++++++ build.xml | 2 +- .../java/org/torproject/collector/webstats/SanitizeWeblogs.java | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md index 94f7a96..d9cf7da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 1.6.0 - 2018-0?-?? + + * Medium changes + - Update and adapt to metrics-lib 2.3.0. + + # Changes in version 1.5.1 - 2018-03-19

* Medium changes diff --git a/build.xml b/build.xml index 780f24e..921ad33 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="release.version" value="1.5.1-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.2.0" /> + <property name="metricslibversion" value="2.3.0" /> <property name="jarincludes" value="collector.properties logback.xml" />

<patternset id="runtime" > diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index fd301b0..88d1456 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;

import java.io.BufferedReader; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.InputStreamReader; import java.io.OutputStream; import java.nio.file.Files; @@ -150,7 +151,7 @@ public class SanitizeWeblogs extends CollecTorMain { WebServerAccessLogPersistence walp = new WebServerAccessLogPersistence( new WebServerAccessLogImpl(toCompressedBytes(retainedLines), - name, false)); + new File(name), name, false)); log.debug("Storing {}.", name); walp.storeOut(this.outputPathName); walp.storeRecent(this.recentPathName);