Add extra parameters to the DockerClient constructor's

mocleiri · mocleiri · commit 5cbefec28535 · 2014-07-07T13:53:36.000-04:00
The defaults remain 10 seconds for the read time out and to enable the
LoggingFilter.

Allows the caller to change the read time out and to disable the LoggingFilter

For large images the logging filter spam's the console with the binary data that
is being transferred.

This new setting allows it to be turned off.
diff --git a/src/main/java/com/github/dockerjava/client/DockerClient.java b/src/main/java/com/github/dockerjava/client/DockerClient.java
@@ -67,21 +67,28 @@ public class DockerClient {
 	private AuthConfig authConfig;
 
 	public DockerClient() throws DockerException {
-		this(Config.createConfig());
+		this(10000, true);
+	}
+	public DockerClient(Integer readTimeout, boolean enableLoggingFilter) throws DockerException {
+		this(Config.createConfig(), readTimeout, enableLoggingFilter);
 	}
 
 	public DockerClient(String serverUrl) throws DockerException {
-		this(configWithServerUrl(serverUrl));
+		this(serverUrl, 10000, true);
 	}
 
+	public DockerClient(String serverUrl, Integer readTimeout, boolean enableLoggingFilter) throws DockerException {
+		this(configWithServerUrl(serverUrl), readTimeout, enableLoggingFilter);
+	}
+	
 	private static Config configWithServerUrl(String serverUrl)
 			throws DockerException {
 		final Config c = Config.createConfig();
 		c.url = URI.create(serverUrl);
 		return c;
 	}
 
-	private DockerClient(Config config) {
+	public DockerClient(Config config, Integer readTimeout, boolean enableLoggingFilter) {
 		ClientConfig clientConfig = new DefaultClientConfig();
 		
 		SchemeRegistry schemeRegistry = new SchemeRegistry();
@@ -101,14 +108,19 @@ private DockerClient(Config config) {
 		client = new ApacheHttpClient4(new ApacheHttpClient4Handler(httpClient,
 				null, false), clientConfig);
 
-		client.setReadTimeout(10000);
+		// 1 hour
+		client.setReadTimeout(readTimeout);
 	
 		client.addFilter(new JsonClientFilter());
-		client.addFilter(new SelectiveLoggingFilter());
+		
+		if (enableLoggingFilter)
+			client.addFilter(new SelectiveLoggingFilter());
 
 		baseResource = client.resource(config.url + "/v" + config.version);
 	}
 
+	
+
 	public void setCredentials(String username, String password, String email) {
 		if (username == null) {
 			throw new IllegalArgumentException("username is null");
