mirror of
https://github.com/systemd/systemd
synced 2024-09-06 08:46:19 +00:00
Merge pull request #15290 from keszybz/unrelated-fixes
Three unrelated minor tweaks
This commit is contained in:
commit
4fbf39926e
|
@ -398,8 +398,8 @@
|
|||
<varlistentry>
|
||||
<term><option>--output-fields=</option></term>
|
||||
|
||||
<listitem><para>A comma separated list of the fields which should be included in the output. This only has an
|
||||
effect for the output modes which would normally show all fields (<option>verbose</option>,
|
||||
<listitem><para>A comma separated list of the fields which should be included in the output. This has an
|
||||
effect only for the output modes which would normally show all fields (<option>verbose</option>,
|
||||
<option>export</option>, <option>json</option>, <option>json-pretty</option>, <option>json-sse</option> and
|
||||
<option>json-seq</option>). The <literal>__CURSOR</literal>, <literal>__REALTIME_TIMESTAMP</literal>,
|
||||
<literal>__MONOTONIC_TIMESTAMP</literal>, and <literal>_BOOT_ID</literal> fields are always
|
||||
|
@ -416,8 +416,13 @@
|
|||
<varlistentry>
|
||||
<term><option>--no-hostname</option></term>
|
||||
|
||||
<listitem><para>Don't show the hostname field of log messages originating from the local host. This switch only
|
||||
has an effect on the <option>short</option> family of output modes (see above).</para></listitem>
|
||||
<listitem><para>Don't show the hostname field of log messages originating from the local host. This
|
||||
switch has an effect only on the <option>short</option> family of output modes (see above).
|
||||
</para>
|
||||
|
||||
<para>Note: this option does not remove occurrences of the hostname from log entries themselves, so
|
||||
it does not prevent the hostname from being visible in the logs.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
|
|
|
@ -786,7 +786,7 @@ static int help(void) {
|
|||
" --listen-http=ADDR Listen for HTTP connections at ADDR\n"
|
||||
" --listen-https=ADDR Listen for HTTPS connections at ADDR\n"
|
||||
" -o --output=FILE|DIR Write output to FILE or DIR/external-*.journal\n"
|
||||
" --compress[=BOOL] XZ-compress the output journal (default: yes)\n"
|
||||
" --compress[=BOOL] Use compression in the output journal (default: yes)\n"
|
||||
" --seal[=BOOL] Use event sealing (default: no)\n"
|
||||
" --key=FILENAME SSL key in PEM format (default:\n"
|
||||
" \"" PRIV_KEY_FILE "\")\n"
|
||||
|
|
|
@ -314,13 +314,9 @@ char *bus_address_escape(const char *v) {
|
|||
int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error) {
|
||||
assert(m);
|
||||
|
||||
if (r < 0) {
|
||||
if (sd_bus_error_is_set(error) || r < 0) {
|
||||
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
|
||||
sd_bus_reply_method_errno(m, r, error);
|
||||
|
||||
} else if (sd_bus_error_is_set(error)) {
|
||||
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
|
||||
sd_bus_reply_method_error(m, error);
|
||||
} else
|
||||
return r;
|
||||
|
||||
|
|
Loading…
Reference in a new issue