X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=0db4a4f69170026bad5c5d540550738b3ebfc091;hb=refs%2Ftags%2Fv1.12.5;hp=fcbbca2ff9aa66ee2ff1d9001d9eadce0b549799;hpb=457c6599b5dae1fb9e06b1c1a2f58a0922de5851;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index fcbbca2..0db4a4f 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2011 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 @@ -34,6 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include // #define MTRACE #ifdef MTRACE @@ -53,8 +58,8 @@ void child_handler(void *data) static void show_version(void) { - char yaz_version_str[80]; - printf("Pazpar2 " PACKAGE_VERSION + char yaz_version_str[20]; + printf("Pazpar2 " PACKAGE_VERSION #ifdef PAZPAR2_VERSION_SHA1 " " PAZPAR2_VERSION_SHA1 @@ -72,7 +77,7 @@ static void show_version(void) printf(" yaz:%s", yaz_version_str); printf("\n"); exit(0); -} +} #ifdef WIN32 static int tcpip_init (void) @@ -89,7 +94,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; @@ -104,6 +109,9 @@ static int sc_main( struct conf_config *config = 0; int test_mode = 0; + xmlInitParser(); + LIBXML_TEST_VERSION + #ifndef WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) yaz_log(YLOG_WARN|YLOG_ERRNO, "signal"); @@ -112,14 +120,17 @@ static int sc_main( #endif yaz_log_init_prefix("pazpar2"); + yaz_log_init_level(yaz_log_mask_str("post")); yaz_log_xml_errors(0, YLOG_WARN); - while ((ret = options("dDf:h:l:p:R:tu:v:VX", argv, argc, &arg)) != -2) + yaz_enable_panic_backtrace(argv[0]); + + 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; @@ -134,11 +145,15 @@ 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; + if (strcmp(arg, "-")) + record_fname = arg; global_parameters.predictable_sessions = 1; break; case 't': @@ -152,6 +167,20 @@ 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++; global_parameters.predictable_sessions = 1; @@ -163,12 +192,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" @@ -184,11 +215,26 @@ static int sc_main( return 1; } pazpar2_mutex_init(); - - config = config_create(config_fname, global_parameters.dump_records); + + { + char yaz_version_str[20]; + char yaz_sha1_str[41]; + yaz_log(YLOG_LOG, "Pazpar2 %s " VERSION " " +#ifdef PAZPAR2_VERSION_SHA1 + PAZPAR2_VERSION_SHA1 +#else + "-" +#endif + , test_mode ? "test" : "start"); + yaz_version(yaz_version_str, yaz_sha1_str); + yaz_log(YLOG_LOG, "YAZ %s %s", yaz_version_str, yaz_sha1_str); + } + + config = config_create(config_fname); if (!config) return 1; sc_stop_config = config; + ret = 0; if (test_mode) { yaz_log(YLOG_LOG, "Configuration OK"); @@ -196,32 +242,28 @@ static int sc_main( } else { - 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 " "mode"); - return 1; + ret = 1; } - ret = config_start_listeners(config, listener_override, record_fname); - 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 0; + config_destroy(config); + return ret; } @@ -234,7 +276,7 @@ int main(int argc, char **argv) { int ret; yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2"); - + #ifdef MTRACE mtrace(); #endif