ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-29 15:43:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace logDebugFlags() with logCurrentConfig()

Browse Source
This commit is contained in:
Andrew Bettison 2013-03-27 17:23:31 +10:30
parent 95b0c028f2
commit bcfd032223
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.c
View File

@ -219,7 +219,7 @@ static int reload_and_parse(int permissive)
return WHYF("config file %s not loaded -- %s", conffile_path(), strbuf_str(b));
WARNF("config file %s loaded despite problems -- %s", conffile_path(), strbuf_str(b));
}
logDebugFlags();
logCurrentConfig();
return 1;
}

32
log.c
View File

@ -421,27 +421,21 @@ void vlogMessage(int level, struct __sourceloc whence, const char *fmt, va_list
vxprintf(it.xpf, fmt, ap);
}
void logDebugFlags()
void logCurrentConfig()
{
struct cf_om_node *debug_root = NULL;
cf_fmt_config_debug(&debug_root, &config.debug);
strbuf b = strbuf_alloca(1024);
struct cf_om_iterator it;
for (cf_om_iter_start(&it, debug_root); it.node; cf_om_iter_next(&it))
if (it.node->text) {
bool_t val = 0;
if (cf_opt_boolean(&val, it.node->text) != CFOK || val) {
if (strbuf_len(b))
strbuf_puts(b, ", ");
strbuf_puts(b, it.node->fullkey);
if (!val) {
strbuf_putc(b, '=');
strbuf_puts(b, it.node->text);
}
}
struct cf_om_node *root = NULL;
int ret = cf_fmt_config_main(&root, &config);
if (ret == CFERROR) {
cf_om_free_node(&root);
WHY("cannot log current config");
} else {
struct cf_om_iterator it;
logMessage(LOG_LEVEL_INFO, __NOWHERE__, "Current configuration:");
for (cf_om_iter_start(&it, root); it.node; cf_om_iter_next(&it)) {
if (it.node->text && it.node->line_number)
logMessage(LOG_LEVEL_INFO, __NOWHERE__, " %s=%s", it.node->fullkey, it.node->text);
}
if (strbuf_len(b))
logMessage(LOG_LEVEL_INFO, __NOWHERE__, "Debug options: %s", strbuf_str(b));
}
}
int logDump(int level, struct __sourceloc whence, char *name, const unsigned char *addr, size_t len)

2
log.h
View File

@ -94,7 +94,7 @@ void logArgv(int level, struct __sourceloc whence, const char *label, int argc,
void logString(int level, struct __sourceloc whence, const char *str);
void logMessage(int level, struct __sourceloc whence, const char *fmt, ...);
void vlogMessage(int level, struct __sourceloc whence, const char *fmt, va_list);
void logDebugFlags();
void logCurrentConfig();
int logDump(int level, struct __sourceloc whence, char *name, const unsigned char *addr, size_t len);
ssize_t get_self_executable_path(char *buf, size_t len);
int log_backtrace(struct __sourceloc whence);