X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=cb69a5e1ba8222f993566f46f14f93af7a3f99ef;hb=c71d13caac58c9b17fccb3b00357db66066d4bb6;hp=3352fa07da4f8aa01e83c9d0f31ce37122e92faa;hpb=9267d02c3601122f74bdf3a9d21f30080a4a1a9a;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index 3352fa0..cb69a5e 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) 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 @@ -27,42 +27,42 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #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 struct conf_config *sc_stop_config = 0; + void child_handler(void *data) { - start_proxy(); - init_settings(); - - if (*global_parameters.settings_path_override) - settings_read(global_parameters.settings_path_override); - else if (global_parameters.server->settings) - settings_read(global_parameters.server->settings); - else - yaz_log(YLOG_WARN, "No settings-directory specified"); - global_parameters.odr_in = odr_createmem(ODR_DECODE); - global_parameters.odr_out = odr_createmem(ODR_ENCODE); - + struct conf_config *config = (struct conf_config *) data; - pazpar2_event_loop(); + config_process_events(config); + config_destroy(config); } static void show_version(void) { char yaz_version_str[80]; - printf("Pazpar2 " PACKAGE_VERSION "\n"); + printf("Pazpar2 " PACKAGE_VERSION +#ifdef PAZPAR2_VERSION_SHA1 + " " + PAZPAR2_VERSION_SHA1 +#endif +"\n"); yaz_version(yaz_version_str, 0); printf("Configuration:"); #if YAZ_HAVE_ICU - printf(" icu:?"); + printf(" icu:enabled"); +#else + printf(" icu:disabled"); #endif printf(" yaz:%s", yaz_version_str); printf("\n"); @@ -93,6 +93,10 @@ static int sc_main( char *arg; const char *pidfile = 0; const char *uid = 0; + const char *listener_override = 0; + const char *config_fname = 0; + struct conf_config *config = 0; + int test_mode = 0; #ifndef WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) @@ -104,7 +108,7 @@ static int sc_main( yaz_log_init_prefix("pazpar2"); yaz_log_xml_errors(0, YLOG_WARN); - while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2) + while ((ret = options("dDf:h:l:p:tu:v:VX", argv, argc, &arg)) != -2) { switch (ret) { @@ -115,11 +119,10 @@ static int sc_main( daemon = 1; break; case 'f': - if (!read_config(arg)) - exit(1); + config_fname = arg; break; case 'h': - strcpy(global_parameters.listener_override, arg); + listener_override = arg; break; case 'l': yaz_log_init_file(arg); @@ -129,69 +132,90 @@ static int sc_main( pidfile = arg; break; case 't': - strcpy(global_parameters.settings_path_override, arg); + 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(); case 'X': - global_parameters.debug_mode = 1; + global_parameters.debug_mode++; 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" " -p pidfile PID file\n" - " -t settings\n" - " -u uid\n" - " -V show version\n" - " -X debug mode\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" - " -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 " 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 = 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); } - global_parameters.server = config->servers; - - ret = start_http_listener(); - 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, 0 /* 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)