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
Fix the log statement on sel file descriptor (sel_fd)
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
3f5b1cf
..
cb69a5e
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
@@
-28,7
+28,8
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <assert.h>
#include "parameters.h"
#include <assert.h>
#include "parameters.h"
-#include "pazpar2.h"
+#include "session.h"
+#include "ppmutex.h"
#include <yaz/daemon.h>
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/daemon.h>
#include <yaz/log.h>
#include <yaz/options.h>
@@
-40,9
+41,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)
@@
-107,7
+108,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)
{
@@
-136,10
+137,13
@@
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':
- global_parameters.debug_mode = 1;
+ global_parameters.debug_mode++;
break;
default:
fprintf(stderr, "Usage: pazpar2\n"
break;
default:
fprintf(stderr, "Usage: pazpar2\n"
@@
-152,6
+156,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"
@@
-166,6
+171,8
@@
static int sc_main(
yaz_log(YLOG_FATAL, "Configuration must be given with option -f");
return 1;
}
yaz_log(YLOG_FATAL, "Configuration must be given with option -f");
return 1;
}
+ pazpar2_mutex_init();
+
config = config_create(config_fname, global_parameters.dump_records);
if (!config)
return 1;
config = config_create(config_fname, global_parameters.dump_records);
if (!config)
return 1;