}
pazpar2_mutex_init();
- config = config_create(config_fname, global_parameters.dump_records);
+ if (!test_mode)
+ {
+ yaz_log(YLOG_LOG, "Pazpar2 start " VERSION " "
+#ifdef PAZPAR2_VERSION_SHA1
+ PAZPAR2_VERSION_SHA1
+#else
+ "-"
+#endif
+ );
+ }
+ config = config_create(config_fname);
if (!config)
return 1;
sc_stop_config = config;
}
else
{
- yaz_log(YLOG_LOG, "Pazpar2 start " VERSION " "
-#ifdef PAZPAR2_VERSION_SHA1
- PAZPAR2_VERSION_SHA1
-#else
- "-"
-#endif
- );
ret = 0;
if (daemon && !log_file_in_use)
{
return 0;
}
-struct conf_config *config_create(const char *fname, int verbose)
+struct conf_config *config_create(const char *fname)
{
xmlDoc *doc = xmlReadFile(fname,
NULL,
r = yaz_xml_include_simple(n, wrbuf_cstr(config->confdir));
if (r == 0) /* OK */
{
- if (verbose)
- {
- yaz_log(YLOG_LOG, "Configuration %s after include processing",
- fname);
+ yaz_log(YLOG_LOG, "Configuration %s after include processing",
+ fname);
#if LIBXML_VERSION >= 20600
- xmlDocFormatDump(yaz_log_file(), doc, 0);
+ xmlDocFormatDump(yaz_log_file(), doc, 0);
#else
- xmlDocDump(yaz_log_file(), doc);
+ xmlDocDump(yaz_log_file(), doc);
#endif
- }
r = parse_config(config, n);
}
xmlFreeDoc(doc);
database_hosts_t database_hosts;
};
-struct conf_config *config_create(const char *fname, int verbose);
+struct conf_config *config_create(const char *fname);
void config_destroy(struct conf_config *config);
void config_process_events(struct conf_config *config);
void info_services(struct conf_server *server, WRBUF w);