X Tutup
Skip to content

Fix Issue #139 Reduce Logging Level #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 1 commit into from
Feb 2, 2015
Merged

Fix Issue #139 Reduce Logging Level #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>

<!--test dependencies -->
<version.logback>1.0.1</version.logback>
<version.logback>1.1.0</version.logback>
<version.testng>5.12.1</version.testng>
<hamcrest.library.version>1.3</hamcrest.library.version>
<hamcrest.jpa-matchers>1.6</hamcrest.jpa-matchers>
Expand Down Expand Up @@ -143,11 +143,11 @@
<version>${slf4j-api.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.slf4j</groupId> -->
<!-- <artifactId>jul-to-slf4j</artifactId> -->
<!-- <version>${slf4j-api.version}</version> -->
<!-- </dependency> -->

<dependency>
<groupId>org.bouncycastle</groupId>
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

import java.io.IOException;
import java.net.URI;
import java.util.logging.Logger;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.net.ssl.SSLContext;
import javax.ws.rs.client.Client;
Expand Down Expand Up @@ -65,7 +67,7 @@

public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {

private static final Logger LOGGER = Logger.getLogger(DockerCmdExecFactoryImpl.class.getName());
private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
private Client client;
private WebTarget baseResource;

Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Logger;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.ClientRequestContext;
Expand All @@ -68,7 +70,6 @@
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.WriterInterceptor;
import javax.ws.rs.ext.WriterInterceptorContext;

import javax.annotation.Priority;


Expand All @@ -86,7 +87,7 @@
public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilter, ContainerResponseFilter,
ClientResponseFilter, WriterInterceptor {

private static final Logger LOGGER = Logger.getLogger(LoggingFilter.class.getName());
private static final Logger LOGGER = LoggerFactory.getLogger(LoggingFilter.class.getName());
private static final String NOTIFICATION_PREFIX = "* ";
private static final String REQUEST_PREFIX = "> ";
private static final String RESPONSE_PREFIX = "< ";
Expand Down Expand Up @@ -150,7 +151,7 @@ public LoggingFilter(final Logger logger, final int maxEntitySize) {

private void log(final StringBuilder b) {
if (logger != null) {
logger.info(b.toString());
logger.debug(b.toString());
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/github/dockerjava/jaxrs/util/SelectiveLoggingFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Logger;

import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;

import org.slf4j.Logger;


/**
* A version of the logging filter that will avoid trying to log entities which can cause
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public abstract class AbstractDockerClientTest extends Assert {
protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory());

public void beforeTest() {


LOG.info("======================= BEFORETEST =======================");
LOG.info("Connecting to Docker server");
dockerClient = DockerClientBuilder.getInstance(config())
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</encoder>
</appender>

<logger name="com.github.dockerjava.client" level="TRACE"/>
<logger name="com.github.dockerjava.client.test" level="DEBUG"/>
<logger name="com.github.dockerjava" level="INFO"/>
<logger name="com.github.dockerjava.jaxrs" level="DEBUG"/>

<root level="info">
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>

Expand Down
X Tutup