Moved readTimeout and enableLoggingFilter to config object

Marcus Linke · Marcus Linke · commit cb9b3f2eb4f2 · 2014-07-15T20:50:48.000+02:00
diff --git a/src/main/java/com/github/dockerjava/client/DockerClient.java b/src/main/java/com/github/dockerjava/client/DockerClient.java
@@ -66,19 +66,13 @@ public class DockerClient {
 	private WebResource baseResource;
 	private AuthConfig authConfig;
 
+	
 	public DockerClient() throws DockerException {
-		this(10000, true);
-	}
-	public DockerClient(Integer readTimeout, boolean enableLoggingFilter) throws DockerException {
-		this(Config.createConfig(), readTimeout, enableLoggingFilter);
+		this(Config.createConfig());
 	}
 
 	public DockerClient(String serverUrl) throws DockerException {
-		this(serverUrl, 10000, true);
-	}
-
-	public DockerClient(String serverUrl, Integer readTimeout, boolean enableLoggingFilter) throws DockerException {
-		this(configWithServerUrl(serverUrl), readTimeout, enableLoggingFilter);
+		this(configWithServerUrl(serverUrl));
 	}
 	
 	private static Config configWithServerUrl(String serverUrl)
@@ -88,7 +82,7 @@ private static Config configWithServerUrl(String serverUrl)
 		return c;
 	}
 
-	public DockerClient(Config config, Integer readTimeout, boolean enableLoggingFilter) {
+	public DockerClient(Config config) {
 		ClientConfig clientConfig = new DefaultClientConfig();
 		
 		SchemeRegistry schemeRegistry = new SchemeRegistry();
@@ -109,11 +103,11 @@ public DockerClient(Config config, Integer readTimeout, boolean enableLoggingFil
 				null, false), clientConfig);
 
 		// 1 hour
-		client.setReadTimeout(readTimeout);
+		client.setReadTimeout(config.readTimeout);
 	
 		client.addFilter(new JsonClientFilter());
 		
-		if (enableLoggingFilter)
+		if (config.enableLoggingFilter)
 			client.addFilter(new SelectiveLoggingFilter());
 
 		baseResource = client.resource(config.url + "/v" + config.version);
diff --git a/src/main/resources/docker.io.properties b/src/main/resources/docker.io.properties
@@ -1,2 +1,4 @@
 docker.io.url=http://localhost:2375
-docker.io.version=1.13
+docker.io.version=1.13
+docker.io.readTimeout=1000
+docker.io.enableLoggingFilter=true
