-/* $Id: pazpar2.c,v 1.90 2007-06-18 11:10:20 adam Exp $
+/* $Id: pazpar2.c,v 1.94 2008-02-18 19:33:32 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
#include "pazpar2.h"
#include "database.h"
#include "settings.h"
+#include <yaz/daemon.h>
void child_handler(void *data)
{
}
+static void show_version(void)
+{
+ char yaz_version_str[80];
+ printf("Pazpar2 " VERSION "\n");
+
+ yaz_version(yaz_version_str, 0);
+
+ printf("Configuration:");
+#if HAVE_ICU
+ printf(" icu:?");
+#endif
+ printf(" yaz:%s", yaz_version_str);
+ printf("\n");
+ exit(0);
+}
+
int main(int argc, char **argv)
{
int daemon = 0;
int ret;
int log_file_in_use = 0;
char *arg;
- const char *pidfile = "pazpar2.pid";
+ const char *pidfile = 0;
const char *uid = 0;
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
yaz_log_init_prefix("pazpar2");
+#if YAZ_VERSIONL >= 0x03001B
+ yaz_log_xml_errors(0, YLOG_WARN);
+#endif
- while ((ret = options("f:h:p:t:u:l:dDX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
{
switch (ret)
{
+ case 'd':
+ global_parameters.dump_records = 1;
+ break;
+ case 'D':
+ daemon = 1;
+ break;
case 'f':
if (!read_config(arg))
exit(1);
case 'h':
strcpy(global_parameters.listener_override, arg);
break;
+ case 'l':
+ yaz_log_init_file(arg);
+ log_file_in_use = 1;
+ break;
case 'p':
pidfile = arg;
break;
case 'u':
uid = arg;
break;
- case 'd':
- global_parameters.dump_records = 1;
- break;
- case 'l':
- yaz_log_init_file(arg);
- log_file_in_use = 1;
- break;
- case 'D':
- daemon = 1;
- break;
+ case 'V':
+ show_version();
case 'X':
global_parameters.debug_mode = 1;
break;
default:
fprintf(stderr, "Usage: pazpar2\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"
" -p pidfile PID file\n"
" -t settings\n"
" -u uid\n"
- " -d (show internal records)\n"
- " -D Daemon mode (background)\n"
- " -l file log to file\n"
+ " -V show version\n"
" -X debug mode\n"
);
exit(1);
global_parameters.server = config->servers;
start_http_listener();
- pazpar2_process(global_parameters.debug_mode, daemon,
- child_handler, 0 /* child_data */,
- pidfile, uid);
+ 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;
}