shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

lvm: shell: honor log/command_log_selection as default and reset to this value after lastlog

Browse Source
This commit is contained in:
Peter Rajnoha 2016-08-04 18:15:54 +02:00
parent e805ef2d66
commit 7111d48748
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/lvm.c
View File

@ -209,7 +209,8 @@ static void _discard_log_report_content(struct cmd_context *cmd)
int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline) int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
{ {
log_report_t saved_log_report_state = log_get_report_state(); log_report_t saved_log_report_state = log_get_report_state();
int is_lastlog_cmd, argc, ret; char *orig_command_log_selection = NULL;
int is_lastlog_cmd = 0, argc, ret;
char *input = NULL, *args[MAX_ARGS], **argv; char *input = NULL, *args[MAX_ARGS], **argv;
rl_readline_name = "lvm"; rl_readline_name = "lvm";
@ -223,10 +224,21 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
if (!report_format_init(cmd)) if (!report_format_init(cmd))
return_ECMD_FAILED; return_ECMD_FAILED;
orig_command_log_selection = dm_pool_strdup(cmd->libmem, find_config_tree_str(cmd, log_command_log_selection_CFG, NULL));
log_set_report_context(LOG_REPORT_CONTEXT_SHELL); log_set_report_context(LOG_REPORT_CONTEXT_SHELL);
log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_CMD); log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_CMD);
while (1) { while (1) {
if (cmd->cmd_report.log_rh) {
/*
* If previous command was lastlog, reset log report selection to
* its original value as set by log/command_log_selection config setting.
*/
if (is_lastlog_cmd &&
!dm_report_set_selection(cmd->cmd_report.log_rh, orig_command_log_selection))
log_error("Failed to reset log report selection.");
}
log_set_report(cmd->cmd_report.log_rh); log_set_report(cmd->cmd_report.log_rh);
log_set_report_object_name_and_id(NULL, NULL); log_set_report_object_name_and_id(NULL, NULL);