chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysv-generator: Skip init scripts for existing native services
[elogind.git]
/
src
/
journal-remote
/
journal-upload.c
diff --git
a/src/journal-remote/journal-upload.c
b/src/journal-remote/journal-upload.c
index 5b25da56d37425b4c9dde9326cabaaea7de8afd6..75bb434c0861f44a9ca924682c07416f57ac3dc4 100644
(file)
--- 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);
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,
easy_setopt(curl, CURLOPT_USERAGENT,
"systemd-journal-upload " PACKAGE_STRING,
@@
-295,7
+296,7
@@
static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *user
return 0;
r = read(u->input, buf, size * nmemb);
return 0;
r = read(u->input, buf, size * nmemb);
- log_debug("%s: allowed %zu, read %z
u
", __func__, size*nmemb, r);
+ log_debug("%s: allowed %zu, read %z
d
", __func__, size*nmemb, r);
if (r > 0)
return r;
if (r > 0)
return r;
@@
-504,15
+505,15
@@
static int perform_upload(Uploader *u) {
}
if (status >= 300) {
}
if (status >= 300) {
- log_error("Upload to %s failed with code %l
u
: %s",
+ log_error("Upload to %s failed with code %l
d
: %s",
u->url, status, strna(u->answer));
return -EIO;
} else if (status < 200) {
u->url, status, strna(u->answer));
return -EIO;
} else if (status < 200) {
- log_error("Upload to %s finished with unexpected code %l
u
: %s",
+ log_error("Upload to %s finished with unexpected code %l
d
: %s",
u->url, status, strna(u->answer));
return -EIO;
} else
u->url, status, strna(u->answer));
return -EIO;
} else
- log_debug("Upload finished successfully with code %l
u
: %s",
+ log_debug("Upload finished successfully with code %l
d
: %s",
status, strna(u->answer));
free(u->last_cursor);
status, strna(u->answer));
free(u->last_cursor);