projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed 'Destroying orphan connection' warning.
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
e3d6627
..
bc87e4c
100644
(file)
--- a/
src/pazpar2.c
+++ b/
src/pazpar2.c
@@
-1,4
+1,4
@@
-/* $Id: pazpar2.c,v 1.89 2007-06-12 13:02:38 adam Exp $
+/* $Id: pazpar2.c,v 1.92 2007-07-10 09:19:32 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-52,9
+52,11
@@
void child_handler(void *data)
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
+ int daemon = 0;
int ret;
int ret;
+ int log_file_in_use = 0;
char *arg;
char *arg;
- const char *pidfile = "pazpar2.pid";
+ const char *pidfile = 0;
const char *uid = 0;
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
const char *uid = 0;
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
@@
-62,10
+64,16
@@
int main(int argc, char **argv)
yaz_log_init_prefix("pazpar2");
yaz_log_init_prefix("pazpar2");
- while ((ret = options("f:h:p:t:u:l:dX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:p:t:u:X", argv, argc, &arg)) != -2)
{
switch (ret)
{
{
switch (ret)
{
+ case 'd':
+ global_parameters.dump_records = 1;
+ break;
+ case 'D':
+ daemon = 1;
+ break;
case 'f':
if (!read_config(arg))
exit(1);
case 'f':
if (!read_config(arg))
exit(1);
@@
-73,6
+81,10
@@
int main(int argc, char **argv)
case 'h':
strcpy(global_parameters.listener_override, arg);
break;
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 'p':
pidfile = arg;
break;
@@
-82,30
+94,32
@@
int main(int argc, char **argv)
case 'u':
uid = arg;
break;
case 'u':
uid = arg;
break;
- case 'd':
- global_parameters.dump_records = 1;
- break;
- case 'l':
- yaz_log_init_file(arg);
- break;
case 'X':
global_parameters.debug_mode = 1;
break;
default:
fprintf(stderr, "Usage: pazpar2\n"
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"
" -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"
" -p pidfile PID file\n"
" -t settings\n"
" -u uid\n"
- " -d (show internal records)\n"
- " -l file log to file\n"
" -X debug mode\n"
);
exit(1);
}
}
" -X debug mode\n"
);
exit(1);
}
}
+ yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION);
+ if (daemon && !log_file_in_use)
+ {
+ yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
+ "mode");
+ exit(1);
+ }
if (!config)
{
yaz_log(YLOG_FATAL, "Load config with -f");
if (!config)
{
yaz_log(YLOG_FATAL, "Load config with -f");
@@
-114,7
+128,7
@@
int main(int argc, char **argv)
global_parameters.server = config->servers;
start_http_listener();
global_parameters.server = config->servers;
start_http_listener();
- pazpar2_process(global_parameters.debug_mode,
+ pazpar2_process(global_parameters.debug_mode, daemon,
child_handler, 0 /* child_data */,
pidfile, uid);
return 0;
child_handler, 0 /* child_data */,
pidfile, uid);
return 0;