shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 11:55:23 +03:00
Code

journal-remote: do not send _BOOT_ID twice

Browse Source 
Also remove the comma from the comment everywhere, I think the comma
unnecessarilly put emphasis on the clause after the comma.

Fixes #9090.

Reproducer:
systemd-journal-remote --split-mode=none -o /tmp/msg6.journal --trust=all --listen-http=8080
systemd-journal-upload -u http://localhost:8080
journalctl --file /tmp/msg6.journal -o verbose -n1
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-05-27 19:03:03 +02:00
parent c0b6ada757
commit 0ab896b343
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/journal-remote/journal-upload-journal.c
View File

@ -8,12 +8,14 @@
#include <curl/curl.h>
#include <stdbool.h>
#include "sd-daemon.h"
#include "alloc-util.h"
#include "journal-upload.h"
#include "log.h"
#include "string-util.h"
#include "utf8.h"
#include "util.h"
#include "sd-daemon.h"
/**
* Write up to size bytes to buf. Return negative on error, and number of
@ -139,8 +141,12 @@ static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
continue;
}
if (!utf8_is_printable_newline(u->field_data,
u->field_length, false)) {
/* We already printed the boot id from the data in
* the header, hence let's suppress it here */
if (memory_startswith(u->field_data, u->field_length, "_BOOT_ID="))
continue;
if (!utf8_is_printable_newline(u->field_data, u->field_length, false)) {
u->entry_state = ENTRY_BINARY_FIELD_START;
continue;
}

9
src/shared/logs-show.c
View File

@ -657,10 +657,8 @@ static int output_export(
JOURNAL_FOREACH_DATA_RETVAL(j, data, length, r) {
const char *c;
/* We already printed the boot id, from the data in
* the header, hence let's suppress it here */
if (length >= 9 &&
startswith(data, "_BOOT_ID="))
/* We already printed the boot id from the data in the header, hence let's suppress it here */
if (memory_startswith(data, length, "_BOOT_ID="))
continue;
c = memchr(data, '=', length);
@ -873,7 +871,8 @@ static int output_json(
size_t m;
unsigned u;
/* We already printed the boot id, from the data in the header, hence let's suppress it here */
/* We already printed the boot id from the data in
* the header, hence let's suppress it here */
if (memory_startswith(data, length, "_BOOT_ID="))
continue;