osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

logging_vty: Ensure writing well-formed config files 

We want to have well-formed config files that print exactly one space
per VTY/config node level, and not two.

Change-Id: Ia75c7067284ea225cffe13ca71bad05a7747ae66
This commit is contained in:
Harald Welte 2018-09-25 20:16:14 +02:00
parent 81bfef931a
commit 0d67f483e2
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/vty/logging_vty.c
View File

@ -890,24 +890,24 @@ static int config_write_log_single(struct vty *vty, struct log_target *tgt)
break;
}
vty_out(vty, " logging filter all %u%s",
vty_out(vty, " logging filter all %u%s",
tgt->filter_map & (1 << LOG_FLT_ALL) ? 1 : 0, VTY_NEWLINE);
/* save filters outside of libosmocore, i.e. in app code */
if (osmo_log_info->save_fn)
osmo_log_info->save_fn(vty, osmo_log_info, tgt);
vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0,
vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0,
VTY_NEWLINE);
vty_out(vty, " logging print category %d%s",
vty_out(vty, " logging print category %d%s",
tgt->print_category ? 1 : 0, VTY_NEWLINE);
if (tgt->print_ext_timestamp)
vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE);
vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE);
else
vty_out(vty, " logging timestamp %u%s",
vty_out(vty, " logging timestamp %u%s",
tgt->print_timestamp ? 1 : 0, VTY_NEWLINE);
if (tgt->print_level)
vty_out(vty, " logging print level 1%s", VTY_NEWLINE);
vty_out(vty, " logging print file %s%s",
vty_out(vty, " logging print level 1%s", VTY_NEWLINE);
vty_out(vty, " logging print file %s%s",
get_value_string(logging_print_file_args, tgt->print_filename2),
VTY_NEWLINE);
@ -918,7 +918,7 @@ static int config_write_log_single(struct vty *vty, struct log_target *tgt)
vty_out(vty, "%% Invalid log level %u for 'force-all'%s",
tgt->loglevel, VTY_NEWLINE);
else
vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE);
vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE);
}
for (i = 0; i < osmo_log_info->num_cat; i++) {
@ -941,7 +941,7 @@ static int config_write_log_single(struct vty *vty, struct log_target *tgt)
continue;
}
vty_out(vty, " logging level %s", cat_name);
vty_out(vty, " logging level %s", cat_name);
vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE);
}

12
tests/logging/logging_vty_test.vty
View File

@ -4,11 +4,11 @@ logging_vty_test# show running-config
...
log stderr
... !logging level all
logging level aa debug
logging level bb info
logging level ccc notice
logging level dddd error
logging level eee fatal
logging level aa debug
logging level bb info
logging level ccc notice
logging level dddd error
logging level eee fatal
...
logging_vty_test# configure terminal
@ -17,7 +17,7 @@ logging_vty_test(config)# log stderr
logging_vty_test(config-log)# logging level force-all notice
logging_vty_test(config-log)# show running-config
... !logging level all
logging level force-all notice
logging level force-all notice
... !logging level all
logging_vty_test(config-log)# no logging level force-all