Skip to content

Commit

Permalink
July updates (#76)
Browse files Browse the repository at this point in the history
* fix config file run command

* dependecies update

* deprecated error propagation

* changelog

Signed-off-by: yyyogev <[email protected]>
  • Loading branch information
yyyogev authored Jul 5, 2020
1 parent 7a1da02 commit 115c03b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER Yogev Mets <[email protected]>

RUN apk add --no-cache --update bash curl vim

ADD target/jmx2graphite-1.4.3-javaagent.jar /jmx2graphite.jar
ADD target/jmx2graphite-1.4.4-javaagent.jar /jmx2graphite.jar
ADD slf4j-simple-1.7.25.jar /slf4j-simple-1.7.25.jar
ADD application.conf /application.conf
# Default Start
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ See our [sample config file](application.conf)].

You can find a complete list of the required parameters [here](#using-bash--jolokia-agent)
```bash
docker run -d -name jmx2graphtite -v path/to/config/myConfig.conf:application.conf logizo/jmx2graphite
docker run -d --name jmx2graphite -v path/to/config/myConfig.conf:/application.conf logzio/jmx2graphite
```
**Note**: The config file at the docker end must be name application.conf

Expand Down Expand Up @@ -249,6 +249,9 @@ docker push logzio/jmx2graphite
# Changelog
- v1.4.4
- dependencies
- remove minor deprecation
- v1.4.3
- update dependencies
- v1.4.0
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.logz</groupId>
<artifactId>jmx2graphite</artifactId>
<version>1.4.3</version>
<version>1.4.4</version>

<build>
<plugins>
Expand Down Expand Up @@ -102,7 +102,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>24.1.1-jre</version>
<version>29.0-jre</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -120,7 +120,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.10.3</version>
<version>2.11.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -143,12 +143,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.11.1</version>
<version>2.13.3</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.2</version>
<version>2.13.3</version>
</dependency>
</dependencies>
</project>
2 changes: 0 additions & 2 deletions src/main/java/io/logz/jmx2graphite/PickledGraphite.java
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,6 @@ private void tryWritingMetrics() throws IOException {
}
throw e;
}
} catch (IOException e) {
throw Throwables.propagate(e);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/logz/jmx2graphite/DummyGraphiteServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void stop() {
Closeables.close(clientSocket, true);
Closeables.close(serverSocket, true);
} catch (IOException e) {
throw Throwables.propagate(e);
logger.error("got IO exception while closing: {}", e);
}
logger.info("Waiting for server to finish shutdown...");
try {
Expand All @@ -93,7 +93,7 @@ public void stop() {
throw new RuntimeException("Timed out on waiting for dummy graphite server shutdown");
}
} catch (InterruptedException e) {
throw Throwables.propagate(e);
logger.error("got interrupt while closing: {}", e);
}
logger.info("Dummy graphite server closed");

Expand Down

0 comments on commit 115c03b

Please sign in to comment.