X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=51b7249bb46347eb2f5b76ba9b6fd6759059fd1b;hb=1b5a08cbaa6e91ed68be8f991cbb0d8b187f5337;hp=66e8a17605acb4dced86bb01b67281ae1be804d6;hpb=ca9817524ebe069581ad72f6bca0e9775d61e30c;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index 66e8a17..51b7249 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 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,6 +22,10 @@ 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 @@ -29,11 +33,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "parameters.h" #include "session.h" +#include "ppmutex.h" #include #include #include #include +// #define MTRACE +#ifdef MTRACE +#include +#endif + static struct conf_config *sc_stop_config = 0; void child_handler(void *data) @@ -48,7 +58,7 @@ void child_handler(void *data) 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 @@ -66,7 +76,7 @@ static void show_version(void) 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; @@ -94,6 +104,7 @@ static int sc_main( const char *uid = 0; const char *listener_override = 0; const char *config_fname = 0; + const char *record_fname = 0; struct conf_config *config = 0; int test_mode = 0; @@ -107,12 +118,12 @@ static int sc_main( yaz_log_init_prefix("pazpar2"); yaz_log_xml_errors(0, YLOG_WARN); - while ((ret = options("dDf:h:l:p:tu:v: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; @@ -127,9 +138,16 @@ 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 'R': + record_fname = arg; + global_parameters.predictable_sessions = 1; + break; case 't': test_mode = 1; break; @@ -141,8 +159,23 @@ static int sc_main( 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" @@ -151,11 +184,14 @@ static int sc_main( " -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" + " -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" @@ -170,7 +206,19 @@ static int sc_main( yaz_log(YLOG_FATAL, "Configuration must be given with option -f"); return 1; } - config = config_create(config_fname, global_parameters.dump_records); + pazpar2_mutex_init(); + + if (!test_mode) + { + yaz_log(YLOG_LOG, "Pazpar2 start " VERSION " " +#ifdef PAZPAR2_VERSION_SHA1 + PAZPAR2_VERSION_SHA1 +#else + "-" +#endif + ); + } + config = config_create(config_fname); if (!config) return 1; sc_stop_config = config; @@ -181,30 +229,27 @@ static int sc_main( } else { - yaz_log(YLOG_LOG, "Pazpar2 " VERSION " " -#ifdef PAZPAR2_VERSION_SHA1 - PAZPAR2_VERSION_SHA1 -#else - "-" -#endif - " started"); + ret = 0; if (daemon && !log_file_in_use) { yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon " "mode"); - return 1; + ret = 1; } - ret = config_start_listeners(config, listener_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); + 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; } return 0; } @@ -220,9 +265,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); }