Changeset 15389 in josm

Timestamp:

2019-09-29T22:47:44+02:00 (5 years ago)

Author:

Don-vip

Message:

allow to set HttpClient log level to DEBUG

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -69 +69 @@
     private Response response;
     private boolean finishOnCloseOutput = true;
+    private boolean debug;
 
     // Pattern to detect Tomcat error message. Be careful with change of format:
@@ -142 +143 @@
                 cr = performConnection();
                 final boolean hasReason = reasonForRequest != null && !reasonForRequest.isEmpty();
-                Logging.info("{0} {1}{2} -> {3} {4}{5}",
+                logRequest("{0} {1}{2} -> {3} {4}{5}",
                         getRequestMethod(), getURL(), hasReason ? (" (" + reasonForRequest + ')') : "",
                         cr.getResponseVersion(), cr.getResponseCode(),
@@ -160 +161 @@
                 }
             } catch (IOException | RuntimeException e) {
-                Logging.info("{0} {1} -> !!!", requestMethod, url);
+                logRequest("{0} {1} -> !!!", requestMethod, url);
                 Logging.warn(e);
                 //noinspection ThrowableResultOfMethodCallIgnored
@@ -175 +176 @@
                     url = new URL(url, redirectLocation);
                     maxRedirects--;
-                    Logging.info(tr("Download redirected to ''{0}''", redirectLocation));
+                    logRequest(tr("Download redirected to ''{0}''", redirectLocation));
                     response = connect();
                     successfulConnection = true;
@@ -207 +208 @@
     }
 
+    protected final void logRequest(String pattern, Object... args) {
+        if (debug) {
+            Logging.debug(pattern, args);
+        } else {
+            Logging.info(pattern, args);
+        }
+    }
+
     protected final void logRequestBody() {
-        Logging.info("{0} {1} ({2}) ...", requestMethod, url, Utils.getSizeString(requestBody.length, Locale.getDefault()));
+        logRequest("{0} {1} ({2}) ...", requestMethod, url, Utils.getSizeString(requestBody.length, Locale.getDefault()));
         if (Logging.isTraceEnabled() && hasRequestBody()) {
             Logging.trace("BODY: {0}", new String(requestBody, StandardCharsets.UTF_8));
@@ -801 +810 @@
     }
 
+    /**
+     * Sets the connect log at DEBUG level instead of the default INFO level.
+     * @param debug {@code true} to set the connect log at DEBUG level
+     * @return {@code this}
+     * @since 15389
+     */
+    public final HttpClient setLogAtDebug(boolean debug) {
+        this.debug = debug;
+        return this;
+    }
+
     private static boolean isRedirect(final int statusCode) {
         switch (statusCode) {