X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=cb69a5e1ba8222f993566f46f14f93af7a3f99ef;hb=refs%2Fheads%2Fbranch-1.4.4;hp=bc87e4c89400263108a968043bd3076a4193cbcc;hpb=04864c49bf43ed46f71e0a6e452d56fe76fdfce1;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index bc87e4c..cb69a5e 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,7 +1,5 @@ -/* $Id: pazpar2.c,v 1.92 2007-07-10 09:19:32 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + 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 @@ -14,43 +12,80 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ #if HAVE_CONFIG_H -#include "cconfig.h" +#include +#endif +#ifdef WIN32 +#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 struct conf_config *sc_stop_config = 0; void child_handler(void *data) { - start_proxy(); - init_settings(); + struct conf_config *config = (struct conf_config *) data; - 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); + config_process_events(config); + + config_destroy(config); +} + +static void show_version(void) +{ + char yaz_version_str[80]; + printf("Pazpar2 " PACKAGE_VERSION +#ifdef PAZPAR2_VERSION_SHA1 + " " + PAZPAR2_VERSION_SHA1 +#endif +"\n"); + yaz_version(yaz_version_str, 0); - pazpar2_event_loop(); + printf("Configuration:"); +#if YAZ_HAVE_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) +{ + WORD requested; + WSADATA wd; + requested = MAKEWORD(1, 1); + if (WSAStartup(requested, &wd)) + return 0; + return 1; } +#endif -int main(int argc, char **argv) + +static int sc_main( + yaz_sc_t s, + int argc, char **argv) { int daemon = 0; int ret; @@ -58,13 +93,22 @@ int main(int argc, char **argv) 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) yaz_log(YLOG_WARN|YLOG_ERRNO, "signal"); +#else + tcpip_init(); +#endif yaz_log_init_prefix("pazpar2"); + yaz_log_xml_errors(0, YLOG_WARN); - while ((ret = options("dDf:h:l:p:t:u:X", argv, argc, &arg)) != -2) + while ((ret = options("dDf:h:l:p:tu:v:VX", argv, argc, &arg)) != -2) { switch (ret) { @@ -75,11 +119,10 @@ int main(int argc, char **argv) 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); @@ -89,56 +132,109 @@ int main(int argc, char **argv) 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" - " -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" +#endif ); - exit(1); + 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"); - exit(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; + sc_stop_config = config; + if (test_mode) { - yaz_log(YLOG_FATAL, "Load config with -f"); - exit(1); + 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; - - start_http_listener(); - pazpar2_process(global_parameters.debug_mode, daemon, - child_handler, 0 /* child_data */, - pidfile, uid); return 0; } +static void sc_stop(yaz_sc_t s) +{ + config_stop_listeners(sc_stop_config); +} + +int main(int argc, char **argv) +{ + int ret; + yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2"); + + ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop); + + yaz_sc_destroy(&s); + exit(ret); +} + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +