From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 6 Jan 2015 05:26:26 +0000 (-0500)
Subject: journal-upload: enable curl debug output conditionally
X-Git-Tag: v219~673
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5dabb1e04e4521abf040e77a8322b70e7acdc7b0;hp=358e019c6e5e18c272ceecd2cdb6838af7389ffb

journal-upload: enable curl debug output conditionally

https://bugs.freedesktop.org/show_bug.cgi?id=86464
---

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 5b25da56d..50332edcc 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -236,8 +236,9 @@ int start_upload(Uploader *u,
                 easy_setopt(curl, CURLOPT_HTTPHEADER, u->header,
                             LOG_ERR, return -EXFULL);
 
-                /* enable verbose for easier tracing */
-                easy_setopt(curl, CURLOPT_VERBOSE, 1L, LOG_WARNING, );
+                if (_unlikely_(log_get_max_level() >= LOG_DEBUG))
+                        /* enable verbose for easier tracing */
+                        easy_setopt(curl, CURLOPT_VERBOSE, 1L, LOG_WARNING, );
 
                 easy_setopt(curl, CURLOPT_USERAGENT,
                             "systemd-journal-upload " PACKAGE_STRING,