Skip to content

Commit 64abb6f

Browse files
marcuslinkemarcuslinke
committed
Merge pull request #142 from docker-java/issue-139
Fix Issue #139
2 parents 11ae37f + 93348ec commit 64abb6f

6 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
6767

6868
<!--test dependencies -->
69-
<version.logback>1.0.1</version.logback>
69+
<version.logback>1.1.0</version.logback>
7070
<version.testng>5.12.1</version.testng>
7171
<hamcrest.library.version>1.3</hamcrest.library.version>
7272
<hamcrest.jpa-matchers>1.6</hamcrest.jpa-matchers>
@@ -143,11 +143,11 @@
143143
<version>${slf4j-api.version}</version>
144144
</dependency>
145145

146-
<dependency>
147-
<groupId>org.slf4j</groupId>
148-
<artifactId>jul-to-slf4j</artifactId>
149-
<version>${slf4j-api.version}</version>
150-
</dependency>
146+
<!-- <dependency> -->
147+
<!-- <groupId>org.slf4j</groupId> -->
148+
<!-- <artifactId>jul-to-slf4j</artifactId> -->
149+
<!-- <version>${slf4j-api.version}</version> -->
150+
<!-- </dependency> -->
151151

152152
<dependency>
153153
<groupId>org.bouncycastle</groupId>

‎src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
import java.io.IOException;
66
import java.net.URI;
7-
import java.util.logging.Logger;
7+
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
810

911
import javax.net.ssl.SSLContext;
1012
import javax.ws.rs.client.Client;
@@ -65,7 +67,7 @@
6567

6668
public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
6769

68-
private static final Logger LOGGER = Logger.getLogger(DockerCmdExecFactoryImpl.class.getName());
70+
private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
6971
private Client client;
7072
private WebTarget baseResource;
7173

‎src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
import java.util.Set;
5454
import java.util.TreeSet;
5555
import java.util.concurrent.atomic.AtomicLong;
56-
import java.util.logging.Logger;
56+
57+
import org.slf4j.Logger;
58+
import org.slf4j.LoggerFactory;
5759

5860
import javax.ws.rs.WebApplicationException;
5961
import javax.ws.rs.client.ClientRequestContext;
@@ -68,7 +70,6 @@
6870
import javax.ws.rs.core.MultivaluedMap;
6971
import javax.ws.rs.ext.WriterInterceptor;
7072
import javax.ws.rs.ext.WriterInterceptorContext;
71-
7273
import javax.annotation.Priority;
7374

7475

@@ -86,7 +87,7 @@
8687
public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilter, ContainerResponseFilter,
8788
ClientResponseFilter, WriterInterceptor {
8889

89-
private static final Logger LOGGER = Logger.getLogger(LoggingFilter.class.getName());
90+
private static final Logger LOGGER = LoggerFactory.getLogger(LoggingFilter.class.getName());
9091
private static final String NOTIFICATION_PREFIX = "* ";
9192
private static final String REQUEST_PREFIX = "> ";
9293
private static final String RESPONSE_PREFIX = "< ";
@@ -150,7 +151,7 @@ public LoggingFilter(final Logger logger, final int maxEntitySize) {
150151

151152
private void log(final StringBuilder b) {
152153
if (logger != null) {
153-
logger.info(b.toString());
154+
logger.debug(b.toString());
154155
}
155156
}
156157

‎src/main/java/com/github/dockerjava/jaxrs/util/SelectiveLoggingFilter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
import java.util.Collections;
55
import java.util.HashSet;
66
import java.util.Set;
7-
import java.util.logging.Logger;
87

98
import javax.ws.rs.client.ClientRequestContext;
109
import javax.ws.rs.core.HttpHeaders;
1110
import javax.ws.rs.core.MediaType;
1211

12+
import org.slf4j.Logger;
13+
1314

1415
/**
1516
* A version of the logging filter that will avoid trying to log entities which can cause

‎src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public abstract class AbstractDockerClientTest extends Assert {
3939
protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory());
4040

4141
public void beforeTest() {
42+
43+
4244
LOG.info("======================= BEFORETEST =======================");
4345
LOG.info("Connecting to Docker server");
4446
dockerClient = DockerClientBuilder.getInstance(config())

‎src/test/resources/logback.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
</encoder>
77
</appender>
88

9-
<logger name="com.github.dockerjava.client" level="TRACE"/>
10-
<logger name="com.github.dockerjava.client.test" level="DEBUG"/>
9+
<logger name="com.github.dockerjava" level="INFO"/>
10+
<logger name="com.github.dockerjava.jaxrs" level="DEBUG"/>
1111

12-
<root level="info">
12+
<root level="INFO">
1313
<appender-ref ref="STDOUT" />
1414
</root>
1515

0 commit comments

Comments
 (0)