From b8e6bbed7897a442505419502034e758075d4cd5 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 2 Jul 2017 19:36:03 +0200 Subject: [PATCH] some cleanup and refactoring --- lib/log_config.c | 14 +++++++++----- tests/integration-tests.sh | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/log_config.c b/lib/log_config.c index 1d00cf256..7dd6278ba 100644 --- a/lib/log_config.c +++ b/lib/log_config.c @@ -30,16 +30,20 @@ int log_parse(struct log *l, config_setting_t *cfg) { - const char *facilities; + const char *fac, *pth; + int lvl; if (!config_setting_is_group(cfg)) cerror(cfg, "Setting 'log' must be a group."); - config_setting_lookup_int(cfg, "level", &l->level); - config_setting_lookup_string(cfg, "file", &l->path); + if (config_setting_lookup_int(cfg, "level", &lvl)) + l->level = lvl; - if (config_setting_lookup_string(cfg, "facilities", &facilities)) - log_set_facility_expression(l, facilities); + if (config_setting_lookup_string(cfg, "file", &pth)) + l->path = pth; + + if (config_setting_lookup_string(cfg, "facilities", &fac)) + log_set_facility_expression(l, fac); l->state = STATE_PARSED; diff --git a/tests/integration-tests.sh b/tests/integration-tests.sh index 3c09afc5d..e1c5e4d2e 100755 --- a/tests/integration-tests.sh +++ b/tests/integration-tests.sh @@ -33,7 +33,6 @@ export PATH=${BUILDDIR}:${PATH} # Default values VERBOSE=0 FILTER='*' - NUM_SAMPLES=100 TIMEOUT=1m