Compare commits
6 Commits
79ac19ae61
...
96100b8a04
Author | SHA1 | Date |
---|---|---|
Anita Zhang | 96100b8a04 | |
Anita Zhang | 9c7179bbfa | |
Anita Zhang | 8f7d2c89c5 | |
Zbigniew Jędrzejewski-Szmek | 1a8f0ce64f | |
Yu Watanabe | 68c1ac1568 | |
Yu Watanabe | df5a4889fe |
|
@ -334,6 +334,8 @@ int config_parse(const char *unit,
|
|||
return r;
|
||||
}
|
||||
|
||||
line++;
|
||||
|
||||
l = skip_leading_chars(buf, WHITESPACE);
|
||||
if (*l != '\0' && strchr(COMMENTS, *l))
|
||||
continue;
|
||||
|
@ -390,7 +392,7 @@ int config_parse(const char *unit,
|
|||
|
||||
r = parse_line(unit,
|
||||
filename,
|
||||
++line,
|
||||
line,
|
||||
sections,
|
||||
lookup,
|
||||
table,
|
||||
|
|
|
@ -80,6 +80,10 @@ static int access_check_var_log_journal(sd_journal *j, bool want_other_users) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
int journal_access_blocked(sd_journal *j) {
|
||||
return hashmap_contains(j->errors, INT_TO_PTR(-EACCES));
|
||||
}
|
||||
|
||||
int journal_access_check_and_warn(sd_journal *j, bool quiet, bool want_other_users) {
|
||||
Iterator it;
|
||||
void *code;
|
||||
|
@ -95,7 +99,7 @@ int journal_access_check_and_warn(sd_journal *j, bool quiet, bool want_other_use
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (hashmap_contains(j->errors, INT_TO_PTR(-EACCES))) {
|
||||
if (journal_access_blocked(j)) {
|
||||
if (!quiet)
|
||||
(void) access_check_var_log_journal(j, want_other_users);
|
||||
|
||||
|
|
|
@ -7,5 +7,5 @@
|
|||
#include "sd-journal.h"
|
||||
|
||||
bool journal_field_valid(const char *p, size_t l, bool allow_protected);
|
||||
|
||||
int journal_access_blocked(sd_journal *j);
|
||||
int journal_access_check_and_warn(sd_journal *j, bool quiet, bool want_other_users);
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "id128-util.h"
|
||||
#include "io-util.h"
|
||||
#include "journal-internal.h"
|
||||
#include "journal-util.h"
|
||||
#include "json.h"
|
||||
#include "log.h"
|
||||
#include "logs-show.h"
|
||||
|
@ -1232,7 +1233,21 @@ int show_journal(
|
|||
|
||||
if (r > 0 && not_before < cutoff) {
|
||||
maybe_print_begin_newline(f, &flags);
|
||||
fprintf(f, "Warning: Journal has been rotated since unit was started. Log output is incomplete or unavailable.\n");
|
||||
|
||||
/* If we logged *something* and no permission error happened, than we can
|
||||
* reliably emit the warning about rotation. If we didn't log anything and
|
||||
* access errors happened, emit hint about permissions. Otherwise, give a
|
||||
* generic message, since we can't diagnose the issue. */
|
||||
|
||||
bool noaccess = journal_access_blocked(j);
|
||||
|
||||
if (line == 0 && noaccess)
|
||||
fprintf(f, "Warning: some journal files were not opened due to insufficient permissions.");
|
||||
else if (!noaccess)
|
||||
fprintf(f, "Warning: journal has been rotated since unit was started, output may be incomplete.\n");
|
||||
else
|
||||
fprintf(f, "Warning: journal has been rotated since unit was started and some journal "
|
||||
"files were not opened due to insufficient permissions, output may be incomplete.\n");
|
||||
}
|
||||
|
||||
warn_cutoff = false;
|
||||
|
|
|
@ -177,18 +177,18 @@ static int export_devices(void) {
|
|||
|
||||
r = sd_device_enumerator_new(&e);
|
||||
if (r < 0)
|
||||
return r;
|
||||
return log_oom();
|
||||
|
||||
r = sd_device_enumerator_allow_uninitialized(e);
|
||||
if (r < 0)
|
||||
return r;
|
||||
return log_error_errno(r, "Failed to set allowing uninitialized flag: %m");
|
||||
|
||||
r = device_enumerator_scan_devices(e);
|
||||
if (r < 0)
|
||||
return r;
|
||||
return log_error_errno(r, "Failed to scan devices: %m");
|
||||
|
||||
FOREACH_DEVICE_AND_SUBSYSTEM(e, d)
|
||||
print_record(d);
|
||||
(void) print_record(d);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue