diff --git a/data/src/main/java/com/microsoft/azure/kusto/data/http/HttpClientProperties.java b/data/src/main/java/com/microsoft/azure/kusto/data/http/HttpClientProperties.java index 37e1f9e7..09cf3981 100644 --- a/data/src/main/java/com/microsoft/azure/kusto/data/http/HttpClientProperties.java +++ b/data/src/main/java/com/microsoft/azure/kusto/data/http/HttpClientProperties.java @@ -105,7 +105,6 @@ public static class HttpClientPropertiesBuilder { private boolean keepAlive; private Integer maxKeepAliveTime = 120; private Integer maxConnectionsTotal = 40; - private Duration timeout = Duration.ofMinutes(10); private Class provider = null; private ProxyOptions proxy = null; @@ -180,17 +179,6 @@ public HttpClientPropertiesBuilder provider(Class return this; } - /** - * Sets a response timeout to use by default on the client's requests. - * - * @param timeout the requested response timeout - * @return the builder instance - */ - public HttpClientPropertiesBuilder timeout(Duration timeout) { - this.timeout = timeout; - return this; - } - /** * Sets a proxy server to use for the client. * @@ -206,5 +194,4 @@ public HttpClientProperties build() { return new HttpClientProperties(this); } } - } diff --git a/data/src/test/resources/simplelogger.properties b/data/src/test/resources/simplelogger.properties index 9a311880..8e3be1b3 100644 --- a/data/src/test/resources/simplelogger.properties +++ b/data/src/test/resources/simplelogger.properties @@ -4,4 +4,6 @@ # Default logging detail level for all instances of SimpleLogger. # Must be one of ("trace", "debug", "info", "warn", or "error"). # If not specified, defaults to "info". -org.slf4j.simpleLogger.log.com.microsoft.azure.kusto=debug \ No newline at end of file +org.slf4j.simpleLogger.log.com.microsoft.azure.kusto=debug +#org.slf4j.simpleLogger.showDateTime=true +#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z \ No newline at end of file diff --git a/ingest/src/main/java/com/microsoft/azure/kusto/ingest/ResourceManager.java b/ingest/src/main/java/com/microsoft/azure/kusto/ingest/ResourceManager.java index 99d56215..ca7c3edd 100644 --- a/ingest/src/main/java/com/microsoft/azure/kusto/ingest/ResourceManager.java +++ b/ingest/src/main/java/com/microsoft/azure/kusto/ingest/ResourceManager.java @@ -51,7 +51,6 @@ class ResourceManager implements Closeable, IngestionResourceManager { private static final long REFRESH_INGESTION_RESOURCES_PERIOD = TimeUnit.HOURS.toMillis(1); private static final long REFRESH_INGESTION_RESOURCES_PERIOD_ON_FAILURE = TimeUnit.MINUTES.toMillis(1); private static final long REFRESH_RESULT_POLL_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(15); - public static final int UPLOAD_TIMEOUT_MINUTES = 10; private final Client client; private final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private Timer refreshTasksTimer; @@ -74,7 +73,7 @@ public ResourceManager(Client client, long defaultRefreshTime, long refreshTimeO this.client = client; // Using ctor with client so that the dependency is used this.httpClient = httpClient == null - ? HttpClientFactory.create(HttpClientProperties.builder().timeout(Duration.ofMinutes(UPLOAD_TIMEOUT_MINUTES)).build()) + ? HttpClientFactory.create(HttpClientProperties.builder().build()) : httpClient; // Refresh tasks diff --git a/ingest/src/test/resources/simplelogger.properties b/ingest/src/test/resources/simplelogger.properties index 9a311880..8e3be1b3 100644 --- a/ingest/src/test/resources/simplelogger.properties +++ b/ingest/src/test/resources/simplelogger.properties @@ -4,4 +4,6 @@ # Default logging detail level for all instances of SimpleLogger. # Must be one of ("trace", "debug", "info", "warn", or "error"). # If not specified, defaults to "info". -org.slf4j.simpleLogger.log.com.microsoft.azure.kusto=debug \ No newline at end of file +org.slf4j.simpleLogger.log.com.microsoft.azure.kusto=debug +#org.slf4j.simpleLogger.showDateTime=true +#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z \ No newline at end of file