X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=56d25990b5f5cdcfdf626ac9861983a4d90a2fc4;hb=5b4ea0cf66dd82c871ed7d69a5801d78789087b2;hp=cacd5390cf369ea66f68ddb104e704cd0add8c46;hpb=babf401143ef8da84a8dd137ac6425b9c4c482ba;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index cacd539..56d2599 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,7 +1,5 @@ -/* $Id: pazpar2.c,v 1.90 2007-06-18 11:10:20 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2009 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,15 +12,17 @@ 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 @@ -30,86 +30,147 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "pazpar2.h" #include "database.h" #include "settings.h" +#include + +#include + +static char *path_override = 0; +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; + config_read_settings(config, path_override); - 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); + pazpar2_event_loop(); +} +static void show_version(void) +{ + char yaz_version_str[80]; + printf("Pazpar2 " PACKAGE_VERSION +#ifdef PAZPAR2_VERSION_SHA1 + " " + PAZPAR2_VERSION_SHA1 +#endif +"\n"); - pazpar2_event_loop(); + yaz_version(yaz_version_str, 0); + + printf("Configuration:"); +#if YAZ_HAVE_ICU + printf(" icu:?"); +#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; int log_file_in_use = 0; char *arg; - const char *pidfile = "pazpar2.pid"; + 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 = 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("f:h:p:t:u:l:dDX", argv, argc, &arg)) != -2) + while ((ret = options("dDf:h:l:p:t:T:u:VX", argv, argc, &arg)) != -2) { switch (ret) { + case 'd': + global_parameters.dump_records = 1; + break; + case 'D': + daemon = 1; + break; case 'f': - if (!read_config(arg)) - exit(1); + config = config_create(arg); + if (!config) + return 1; + sc_stop_config = config; break; case 'h': - strcpy(global_parameters.listener_override, arg); + listener_override = arg; + break; + case 'l': + yaz_log_init_file(arg); + log_file_in_use = 1; break; case 'p': pidfile = arg; break; case 't': - strcpy(global_parameters.settings_path_override, arg); + path_override = arg; + 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; break; case 'u': uid = arg; break; - case 'd': - global_parameters.dump_records = 1; - break; - case 'l': - yaz_log_init_file(arg); - log_file_in_use = 1; - break; - case 'D': - daemon = 1; - break; + case 'V': + show_version(); case 'X': global_parameters.debug_mode = 1; break; default: fprintf(stderr, "Usage: pazpar2\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" " -p pidfile PID file\n" " -t settings\n" + " -T session_timeout\n" " -u uid\n" - " -d (show internal records)\n" - " -D Daemon mode (background)\n" - " -l file log to file\n" + " -V show version\n" " -X debug mode\n" +#ifdef WIN32 + " -install install windows service\n" + " -remove remove windows service\n" +#endif ); - exit(1); + return 1; } } @@ -118,27 +179,50 @@ int main(int argc, char **argv) { yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon " "mode"); - exit(1); + return 1; } if (!config) { yaz_log(YLOG_FATAL, "Load config with -f"); - exit(1); + return 1; } - global_parameters.server = config->servers; + ret = config_start_listeners(config, listener_override, proxy_override); + if (ret) + return ret; /* error starting http listener */ + + yaz_sc_running(s); - start_http_listener(); - pazpar2_process(global_parameters.debug_mode, daemon, - child_handler, 0 /* child_data */, - pidfile, uid); + 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) +{ + 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 */ +