shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 02:21:44 +03:00
Code

loginctl: optionally output table in json

Browse Source 
This works now:

  $ loginctl list-session --output=json-pretty
This commit is contained in:
Lennart Poettering 2018-12-03 20:46:33 +01:00
parent 31ac235771
commit e3483674ec
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/login/loginctl.c
View File

@ -101,7 +101,10 @@ static int show_table(Table *table, const char *word) {
table_set_header(table, arg_legend);
r = table_print(table, NULL);
if (OUTPUT_MODE_IS_JSON(arg_output))
r = table_print_json(table, NULL, output_mode_to_json_format_flags(arg_output) | JSON_FORMAT_COLOR_AUTO);
else
r = table_print(table, NULL);
if (r < 0)
return log_error_errno(r, "Failed to show table: %m");
}
@ -1434,6 +1437,10 @@ static int parse_argv(int argc, char *argv[]) {
if (arg_output < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Unknown output '%s'.", optarg);
if (OUTPUT_MODE_IS_JSON(arg_output))
arg_legend = false;
break;
case ARG_NO_PAGER: