/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
#include <yaz/sc.h>
+static char *path_override = 0;
+static struct conf_config *sc_stop_config = 0;
+
void child_handler(void *data)
{
- start_proxy();
- init_settings();
-
- if (*global_parameters.settings_path_override)
- settings_read(global_parameters.settings_path_override);
- else if (global_parameters.server->settings)
- settings_read(global_parameters.server->settings);
- else
- yaz_log(YLOG_WARN, "No settings-directory specified");
- global_parameters.odr_in = odr_createmem(ODR_DECODE);
- global_parameters.odr_out = odr_createmem(ODR_ENCODE);
-
+ struct conf_config *config = (struct conf_config *) data;
+ config_read_settings(config, path_override);
pazpar2_event_loop();
-
}
static void show_version(void)
{
char yaz_version_str[80];
- printf("Pazpar2 " PACKAGE_VERSION "\n");
+ printf("Pazpar2 " PACKAGE_VERSION
+#ifdef PAZPAR2_VERSION_SHA1
+ " "
+ PAZPAR2_VERSION_SHA1
+#endif
+"\n");
yaz_version(yaz_version_str, 0);
printf("Configuration:");
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
printf(" icu:?");
#endif
printf(" yaz:%s", yaz_version_str);
char *arg;
const char *pidfile = 0;
const char *uid = 0;
+ int session_timeout = 60;
+ const char *listener_override = 0;
+ const char *proxy_override = 0;
+ struct conf_config *config;
#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:u:VX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:p:t:T:u:VX", argv, argc, &arg)) != -2)
{
switch (ret)
{
daemon = 1;
break;
case 'f':
- if (!read_config(arg))
+ config = read_config(arg);
+ if (!config)
exit(1);
+ sc_stop_config = config;
break;
case 'h':
- strcpy(global_parameters.listener_override, arg);
+ listener_override = arg;
break;
case 'l':
yaz_log_init_file(arg);
pidfile = arg;
break;
case 't':
- strcpy(global_parameters.settings_path_override, arg);
+ path_override = arg;
+ break;
+ case 'T':
+ session_timeout = atoi(arg);
+ if (session_timeout < 9 || session_timeout > 86400)
+ {
+ yaz_log(YLOG_FATAL, "Session timeout out of range 10..86400: %d",
+ session_timeout);
+ return 1;
+ }
+ global_parameters.session_timeout = session_timeout;
break;
case 'u':
uid = arg;
" -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"
" -X debug mode\n"
yaz_log(YLOG_FATAL, "Load config with -f");
return 1;
}
- global_parameters.server = config->servers;
-
- ret = start_http_listener();
+ ret = config_start_listeners(config, listener_override, proxy_override);
if (ret)
return ret; /* error starting http listener */
yaz_daemon("pazpar2",
(global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
(daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
- child_handler, 0 /* child_data */,
+ child_handler, config /* child_data */,
pidfile, uid);
return 0;
}
static void sc_stop(yaz_sc_t s)
{
- http_close_server();
+ config_stop_listeners(sc_stop_config);
}
int main(int argc, char **argv)
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+