X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=24526d07ed24ff7525a3ba94a09d47f6c3578aeb;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=f982a03de375295647a06aea851ea9cefabfdaa4;hpb=de634461a0500801cd71d6a42aff032fa083a127;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index f982a03..24526d0 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 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 @@ -22,35 +22,43 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #ifdef WIN32 #include +#include +#endif +#if HAVE_UNISTD_H +#include #endif #include #include -#include "pazpar2.h" -#include "database.h" -#include "settings.h" +#include "parameters.h" +#include "session.h" +#include "ppmutex.h" #include - +#include +#include #include -static char *path_override = 0; +// #define MTRACE +#ifdef MTRACE +#include +#endif + +static struct conf_config *sc_stop_config = 0; void child_handler(void *data) { struct conf_config *config = (struct conf_config *) data; - config_read_settings(config, path_override); - global_parameters.odr_in = odr_createmem(ODR_DECODE); - global_parameters.odr_out = odr_createmem(ODR_ENCODE); + config_process_events(config); - pazpar2_event_loop(); + config_destroy(config); } static void show_version(void) { char yaz_version_str[80]; - printf("Pazpar2 " PACKAGE_VERSION + printf("Pazpar2 " PACKAGE_VERSION #ifdef PAZPAR2_VERSION_SHA1 " " PAZPAR2_VERSION_SHA1 @@ -61,12 +69,14 @@ 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"); exit(0); -} +} #ifdef WIN32 static int tcpip_init (void) @@ -83,7 +93,7 @@ static int tcpip_init (void) static int sc_main( - yaz_sc_t s, + yaz_sc_t s, int argc, char **argv) { int daemon = 0; @@ -92,10 +102,11 @@ static int sc_main( char *arg; const char *pidfile = 0; const char *uid = 0; - int session_timeout = 60; const char *listener_override = 0; - const char *proxy_override = 0; - struct conf_config *config; + const char *config_fname = 0; + const char *record_fname = 0; + struct conf_config *config = 0; + int test_mode = 0; #ifndef WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) @@ -107,20 +118,18 @@ static int sc_main( 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:m:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2) { switch (ret) { case 'd': - global_parameters.dump_records = 1; + global_parameters.dump_records++; break; case 'D': daemon = 1; break; case 'f': - config = read_config(arg); - if (!config) - exit(1); + config_fname = arg; break; case 'h': listener_override = arg; @@ -129,82 +138,123 @@ static int sc_main( yaz_log_init_file(arg); log_file_in_use = 1; break; + case 'm': + yaz_log_time_format(arg); + break; case 'p': pidfile = arg; break; - case 't': - path_override = arg; + case 'R': + record_fname = arg; + global_parameters.predictable_sessions = 1; 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; + case 't': + 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(); + break; + case 'w': + if ( +#ifdef WIN32 + _chdir +#else + chdir +#endif + (arg)) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "chdir %s", arg); + return 1; + } + break; case 'X': - global_parameters.debug_mode = 1; + global_parameters.debug_mode++; + global_parameters.predictable_sessions = 1; 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" + " -m logformat log time format (strftime)\n" " -p pidfile PID file\n" - " -t settings\n" - " -T session_timeout\n" - " -u uid\n" - " -V show version\n" - " -X debug mode\n" + " -R recfile HTTP recording file\n" + " -t Test configuration\n" + " -u uid Change user to uid\n" + " -V Show version\n" + " -v level Set log level\n" + " -w dir Working directory\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; } + pazpar2_mutex_init(); + + 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 start " VERSION " " +#ifdef PAZPAR2_VERSION_SHA1 + PAZPAR2_VERSION_SHA1 +#else + "-" +#endif + ); + ret = 0; + if (daemon && !log_file_in_use) + { + yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon " + "mode"); + ret = 1; + } + if (!ret) + ret = config_start_listeners(config, listener_override, + record_fname); + if (!ret) + { + 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); + } + yaz_log(YLOG_LOG, "Pazpar2 stop"); + return ret; } - ret = start_http_listener(config, listener_override, proxy_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); 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) @@ -212,9 +262,19 @@ int main(int argc, char **argv) int ret; yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2"); +#ifdef MTRACE + mtrace(); +#endif + ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop); yaz_sc_destroy(&s); + +#ifdef MTRACE + muntrace(); +#endif + + exit(ret); }