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
New host list manager: database_hosts_t
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
34bbf42
..
f94d585
100644
(file)
--- a/
src/pazpar2.c
+++ b/
src/pazpar2.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* 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
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
@@
-27,11
+27,11
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <signal.h>
#include <assert.h>
#include <signal.h>
#include <assert.h>
+#include "parameters.h"
#include "pazpar2.h"
#include "pazpar2.h"
-#include "database.h"
-#include "settings.h"
#include <yaz/daemon.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;
#include <yaz/sc.h>
static struct conf_config *sc_stop_config = 0;
@@
-40,9
+40,9
@@
void child_handler(void *data)
{
struct conf_config *config = (struct conf_config *) data;
{
struct conf_config *config = (struct conf_config *) data;
- config_start_databases(config);
+ config_process_events(config);
- pazpar2_event_loop();
+ config_destroy(config);
}
static void show_version(void)
}
static void show_version(void)
@@
-59,7
+59,9
@@
static void show_version(void)
printf("Configuration:");
#if YAZ_HAVE_ICU
printf("Configuration:");
#if YAZ_HAVE_ICU
- printf(" icu:?");
+ printf(" icu:enabled");
+#else
+ printf(" icu:disabled");
#endif
printf(" yaz:%s", yaz_version_str);
printf("\n");
#endif
printf(" yaz:%s", yaz_version_str);
printf("\n");
@@
-105,7
+107,7
@@
static int sc_main(
yaz_log_init_prefix("pazpar2");
yaz_log_xml_errors(0, YLOG_WARN);
yaz_log_init_prefix("pazpar2");
yaz_log_xml_errors(0, YLOG_WARN);
- while ((ret = options("dDf:h:l:p:tu:VX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:p:tu:v:VX", argv, argc, &arg)) != -2)
{
switch (ret)
{
{
switch (ret)
{
@@
-134,6
+136,9
@@
static int sc_main(
case 'u':
uid = arg;
break;
case 'u':
uid = arg;
break;
+ case 'v':
+ yaz_log_init_level(yaz_log_mask_str(arg));
+ break;
case 'V':
show_version();
case 'X':
case 'V':
show_version();
case 'X':
@@
-150,6
+155,7
@@
static int sc_main(
" -t Test configuration\n"
" -u uid Change user to uid\n"
" -V Show version\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"
" -X Debug mode\n"
#ifdef WIN32
" -install Install windows service\n"
@@
-175,7
+181,13
@@
static int sc_main(
}
else
{
}
else
{
- yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION);
+ 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 "
if (daemon && !log_file_in_use)
{
yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "