#include <yaz/sc.h>
-static char *path_override = 0;
+static struct conf_config *sc_stop_config = 0;
void child_handler(void *data)
{
struct conf_config *config = (struct conf_config *) data;
- config_read_settings(config, path_override);
+ config_read_settings(config);
pazpar2_event_loop();
}
int session_timeout = 60;
const char *listener_override = 0;
const char *proxy_override = 0;
- struct conf_config *config;
+ struct conf_config *config = 0;
#ifndef WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
yaz_log_init_prefix("pazpar2");
yaz_log_xml_errors(0, YLOG_WARN);
- while ((ret = options("dDf:h:l:p:t:T:u:VX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:p:T:u:VX", argv, argc, &arg)) != -2)
{
switch (ret)
{
daemon = 1;
break;
case 'f':
- config = read_config(arg);
+ config = config_create(arg);
if (!config)
- exit(1);
+ return 1;
+ sc_stop_config = config;
break;
case 'h':
listener_override = arg;
case 'p':
pidfile = arg;
break;
- case 't':
- path_override = arg;
- break;
case 'T':
session_timeout = atoi(arg);
if (session_timeout < 9 || session_timeout > 86400)
" -h [host:]port (REST protocol listener)\n"
" -l file log to file\n"
" -p pidfile PID file\n"
- " -t settings\n"
" -T session_timeout\n"
" -u uid\n"
" -V show version\n"
yaz_log(YLOG_FATAL, "Load config with -f");
return 1;
}
- ret = start_http_listener(config, listener_override, proxy_override);
+ ret = config_start_listeners(config, listener_override, proxy_override);
if (ret)
return ret; /* error starting http listener */
static void sc_stop(yaz_sc_t s)
{
- http_close_server();
+ config_stop_listeners(sc_stop_config);
}
int main(int argc, char **argv)