chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
loginctl: show the 10 most recent log user/session log lines in "loginctl user-status...
[elogind.git]
/
src
/
shared
/
logs-show.c
diff --git
a/src/shared/logs-show.c
b/src/shared/logs-show.c
index 16ea1bb782d552b6717bf063a3f6c9f3aefd7764..b7a99d2c23118e5b755277e4f4a664f346de95bb 100644
(file)
--- a/
src/shared/logs-show.c
+++ b/
src/shared/logs-show.c
@@
-295,10
+295,8
@@
static int output_short(
if (r < 0)
r = sd_journal_get_monotonic_usec(j, &t, &boot_id);
if (r < 0)
r = sd_journal_get_monotonic_usec(j, &t, &boot_id);
- if (r < 0) {
- log_error_errno(r, "Failed to get monotonic timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get monotonic timestamp: %m");
fprintf(f, "[%5llu.%06llu]",
(unsigned long long) (t / USEC_PER_SEC),
fprintf(f, "[%5llu.%06llu]",
(unsigned long long) (t / USEC_PER_SEC),
@@
-322,10
+320,8
@@
static int output_short(
if (r < 0)
r = sd_journal_get_realtime_usec(j, &x);
if (r < 0)
r = sd_journal_get_realtime_usec(j, &x);
- if (r < 0) {
- log_error_errno(r, "Failed to get realtime timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get realtime timestamp: %m");
t = (time_t) (x / USEC_PER_SEC);
t = (time_t) (x / USEC_PER_SEC);
@@
-440,10
+436,8
@@
static int output_verbose(
}
r = sd_journal_get_cursor(j, &cursor);
}
r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error_errno(r, "Failed to get cursor: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get cursor: %m");
fprintf(f, "%s [%s]\n",
flags & OUTPUT_UTC ?
fprintf(f, "%s [%s]\n",
flags & OUTPUT_UTC ?
@@
-515,22
+509,16
@@
static int output_export(
sd_journal_set_data_threshold(j, 0);
r = sd_journal_get_realtime_usec(j, &realtime);
sd_journal_set_data_threshold(j, 0);
r = sd_journal_get_realtime_usec(j, &realtime);
- if (r < 0) {
- log_error_errno(r, "Failed to get realtime timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get realtime timestamp: %m");
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
- if (r < 0) {
- log_error_errno(r, "Failed to get monotonic timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get monotonic timestamp: %m");
r = sd_journal_get_cursor(j, &cursor);
r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error_errno(r, "Failed to get cursor: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get cursor: %m");
fprintf(f,
"__CURSOR=%s\n"
fprintf(f,
"__CURSOR=%s\n"
@@
-655,22
+643,16
@@
static int output_json(
sd_journal_set_data_threshold(j, flags & OUTPUT_SHOW_ALL ? 0 : JSON_THRESHOLD);
r = sd_journal_get_realtime_usec(j, &realtime);
sd_journal_set_data_threshold(j, flags & OUTPUT_SHOW_ALL ? 0 : JSON_THRESHOLD);
r = sd_journal_get_realtime_usec(j, &realtime);
- if (r < 0) {
- log_error_errno(r, "Failed to get realtime timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get realtime timestamp: %m");
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
- if (r < 0) {
- log_error_errno(r, "Failed to get monotonic timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get monotonic timestamp: %m");
r = sd_journal_get_cursor(j, &cursor);
r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error_errno(r, "Failed to get cursor: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get cursor: %m");
if (mode == OUTPUT_JSON_PRETTY)
fprintf(f,
if (mode == OUTPUT_JSON_PRETTY)
fprintf(f,
@@
-876,8
+858,7
@@
static int output_cat(
if (r == -ENOENT)
return 0;
if (r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to get data: %m");
- return r;
+ return log_error_errno(r, "Failed to get data: %m");
}
assert(l >= 8);
}
assert(l >= 8);
@@
-1224,24
+1205,18
@@
int add_match_this_boot(sd_journal *j, const char *machine) {
if (machine) {
r = get_boot_id_for_machine(machine, &boot_id);
if (machine) {
r = get_boot_id_for_machine(machine, &boot_id);
- if (r < 0) {
- log_error_errno(r, "Failed to get boot id of container %s: %m", machine);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get boot id of container %s: %m", machine);
} else {
r = sd_id128_get_boot(&boot_id);
} else {
r = sd_id128_get_boot(&boot_id);
- if (r < 0) {
- log_error_errno(r, "Failed to get boot id: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get boot id: %m");
}
sd_id128_to_string(boot_id, match + 9);
r = sd_journal_add_match(j, match, strlen(match));
}
sd_id128_to_string(boot_id, match + 9);
r = sd_journal_add_match(j, match, strlen(match));
- if (r < 0) {
- log_error_errno(r, "Failed to add match: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add match: %m");
r = sd_journal_add_conjunction(j);
if (r < 0)
r = sd_journal_add_conjunction(j);
if (r < 0)
@@
-1259,12
+1234,12
@@
int show_journal_by_unit(
unsigned how_many,
uid_t uid,
OutputFlags flags,
unsigned how_many,
uid_t uid,
OutputFlags flags,
- bool system,
+ int journal_open_flags,
+ bool system_unit,
bool *ellipsized) {
_cleanup_journal_close_ sd_journal*j = NULL;
int r;
bool *ellipsized) {
_cleanup_journal_close_ sd_journal*j = NULL;
int r;
- int jflags = SD_JOURNAL_LOCAL_ONLY | system * SD_JOURNAL_SYSTEM;
assert(mode >= 0);
assert(mode < _OUTPUT_MODE_MAX);
assert(mode >= 0);
assert(mode < _OUTPUT_MODE_MAX);
@@
-1273,7
+1248,7
@@
int show_journal_by_unit(
if (how_many <= 0)
return 0;
if (how_many <= 0)
return 0;
- r = sd_journal_open(&j, jflags);
+ r = sd_journal_open(&j, j
ournal_open_
flags);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1281,14
+1256,14
@@
int show_journal_by_unit(
if (r < 0)
return r;
if (r < 0)
return r;
- if (system)
+ if (system
_unit
)
r = add_matches_for_unit(j, unit);
else
r = add_matches_for_user_unit(j, unit, uid);
if (r < 0)
return r;
r = add_matches_for_unit(j, unit);
else
r = add_matches_for_user_unit(j, unit, uid);
if (r < 0)
return r;
- if (_unlikely_(log_get_max_level() >= LOG_
PRI(LOG_DEBUG)
)) {
+ if (_unlikely_(log_get_max_level() >= LOG_
DEBUG
)) {
_cleanup_free_ char *filter;
filter = journal_make_match_string(j);
_cleanup_free_ char *filter;
filter = journal_make_match_string(j);