From a6e87e90ede66815989ba2db92a07102a69906fe Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 5 Sep 2012 15:25:32 -0700 Subject: journalctl: rework JSON output mode This splits the JSON output mode into different modes: json and json-pretty. The former printing one entry per line, the latter showing JSON objects nicely indented and in multiple lines to make it easier to read for humans. --- src/shared/logs-show.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/shared/logs-show.h') diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h index 58ff9e5760..3e6b6e0f64 100644 --- a/src/shared/logs-show.h +++ b/src/shared/logs-show.h @@ -33,6 +33,7 @@ typedef enum OutputMode { OUTPUT_VERBOSE, OUTPUT_EXPORT, OUTPUT_JSON, + OUTPUT_JSON_PRETTY, OUTPUT_CAT, _OUTPUT_MODE_MAX, _OUTPUT_MODE_INVALID = -1 @@ -40,11 +41,10 @@ typedef enum OutputMode { typedef enum OutputFlags { OUTPUT_SHOW_ALL = 1 << 0, - OUTPUT_MONOTONIC_MODE = 1 << 1, - OUTPUT_FOLLOW = 1 << 2, - OUTPUT_WARN_CUTOFF = 1 << 3, - OUTPUT_FULL_WIDTH = 1 << 4, - OUTPUT_COLOR = 1 << 5 + OUTPUT_FOLLOW = 1 << 1, + OUTPUT_WARN_CUTOFF = 1 << 2, + OUTPUT_FULL_WIDTH = 1 << 3, + OUTPUT_COLOR = 1 << 4 } OutputFlags; int output_journal(sd_journal *j, OutputMode mode, unsigned line, -- cgit v1.2.3-54-g00ecf