/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 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 <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_service *service = global_parameters.server->service;
- start_proxy();
-
- init_settings(service);
-
- if (*global_parameters.settings_path_override)
- settings_read(service, global_parameters.settings_path_override);
- else if (global_parameters.server->settings)
- settings_read(service, 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_start_databases(config);
pazpar2_event_loop();
+
+ config_destroy(config);
}
static void show_version(void)
printf("Configuration:");
#if YAZ_HAVE_ICU
- printf(" icu:?");
+ printf(" icu:enabled");
+#else
+ printf(" icu:disabled");
#endif
printf(" yaz:%s", yaz_version_str);
printf("\n");
char *arg;
const char *pidfile = 0;
const char *uid = 0;
- int session_timeout = 60;
+ const char *listener_override = 0;
+ const char *config_fname = 0;
+ struct conf_config *config = 0;
+ int test_mode = 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:tu:v:VX", argv, argc, &arg)) != -2)
{
switch (ret)
{
daemon = 1;
break;
case 'f':
- if (!read_config(arg))
- exit(1);
+ config_fname = arg;
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);
- 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;
+ test_mode = 1;
break;
case 'u':
uid = arg;
break;
+ case 'v':
+ yaz_log_init_level(yaz_log_mask_str(arg));
+ break;
case 'V':
show_version();
case 'X':
break;
default:
fprintf(stderr, "Usage: pazpar2\n"
- " -d (show internal records)\n"
+ " -d Show internal records\n"
" -D Daemon mode (background)\n"
- " -f configfile\n"
- " -h [host:]port (REST protocol listener)\n"
- " -l file log to file\n"
+ " -f configfile Configuration\n"
+ " -h [host:]port Listener port\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"
- " -X debug mode\n"
+ " -t Test configuration\n"
+ " -u uid Change user to uid\n"
+ " -V Show version\n"
+ " -v level Set log level\n"
+ " -X Debug mode\n"
#ifdef WIN32
- " -install install windows service\n"
- " -remove remove windows service\n"
+ " -install Install windows service\n"
+ " -remove Remove windows service\n"
#endif
);
return 1;
}
}
-
- yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION);
- if (daemon && !log_file_in_use)
+ if (!config_fname)
{
- yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
- "mode");
+ yaz_log(YLOG_FATAL, "Configuration must be given with option -f");
return 1;
}
+ config = config_create(config_fname, global_parameters.dump_records);
if (!config)
- {
- yaz_log(YLOG_FATAL, "Load config with -f");
return 1;
+ sc_stop_config = config;
+ if (test_mode)
+ {
+ yaz_log(YLOG_LOG, "Configuration OK");
+ config_destroy(config);
+ }
+ else
+ {
+ yaz_log(YLOG_LOG, "Pazpar2 " VERSION " "
+#ifdef PAZPAR2_VERSION_SHA1
+ PAZPAR2_VERSION_SHA1
+#else
+ "-"
+#endif
+ " started");
+ if (daemon && !log_file_in_use)
+ {
+ yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
+ "mode");
+ return 1;
+ }
+ ret = config_start_listeners(config, listener_override);
+ if (ret)
+ return ret; /* error starting http listener */
+
+ yaz_sc_running(s);
+
+ yaz_daemon("pazpar2",
+ (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
+ (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
+ child_handler, config /* child_data */,
+ pidfile, uid);
}
- global_parameters.server = config->servers;
-
- ret = start_http_listener();
- if (ret)
- return ret; /* error starting http listener */
-
- yaz_sc_running(s);
-
- yaz_daemon("pazpar2",
- (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
- (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
- child_handler, 0 /* 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)
projects / pazpar2-moved-to-github.git / blobdiff