#include <signal.h>
#include <assert.h>
+#include "parameters.h"
#include "pazpar2.h"
-#include "database.h"
-#include "settings.h"
#include <yaz/daemon.h>
-
+#include <yaz/log.h>
+#include <yaz/options.h>
#include <yaz/sc.h>
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);
+
+ config_start_databases(config);
pazpar2_event_loop();
}
char *arg;
const char *pidfile = 0;
const char *uid = 0;
- int session_timeout = 60;
const char *listener_override = 0;
- const char *proxy_override = 0;
const char *config_fname = 0;
struct conf_config *config = 0;
int test_mode = 0;
yaz_log_init_prefix("pazpar2");
yaz_log_xml_errors(0, YLOG_WARN);
- while ((ret = options("dDf:h:l:p:tT:u:VX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:p:tu:VX", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 't':
test_mode = 1;
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;
break;
" -l file Log to file\n"
" -p pidfile PID file\n"
" -t Test configuration\n"
- " -T session_timeout Session timeout\n"
" -u uid Change user to uid\n"
" -V Show version\n"
" -X Debug mode\n"
"mode");
return 1;
}
- ret = config_start_listeners(config, listener_override, proxy_override);
+ ret = config_start_listeners(config, listener_override);
if (ret)
return ret; /* error starting http listener */