picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal-remote: show error if SplitMode=host with 'active' source is specified

Browse source
This commit is contained in:
Yu Watanabe 2017-08-30 16:56:41 +09:00
parent 40cdf0c962
commit cb30d3ba66
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/journal-remote/journal-remote.c
View file

@ -66,7 +66,7 @@ static int arg_seal = false;
static int http_socket = -1, https_socket = -1;
static char** arg_gnutls_log = NULL;
static JournalWriteSplitMode arg_split_mode = JOURNAL_WRITE_SPLIT_HOST;
static JournalWriteSplitMode arg_split_mode = _JOURNAL_WRITE_SPLIT_INVALID;
static char* arg_output = NULL;
static char *arg_key = NULL;
@ -1492,9 +1492,17 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
if (!IN_SET(arg_split_mode, JOURNAL_WRITE_SPLIT_NONE, _JOURNAL_WRITE_SPLIT_INVALID)) {
log_error("For active sources, only --split-mode=none is allowed.");
return -EINVAL;
}
arg_split_mode = JOURNAL_WRITE_SPLIT_NONE;
}
if (arg_split_mode == _JOURNAL_WRITE_SPLIT_INVALID)
arg_split_mode = JOURNAL_WRITE_SPLIT_HOST;
if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE && arg_output) {
if (is_dir(arg_output, true) > 0) {
log_error("For SplitMode=none, output must be a file.");