X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=56d25990b5f5cdcfdf626ac9861983a4d90a2fc4;hb=5b4ea0cf66dd82c871ed7d69a5801d78789087b2;hp=dbcf4b8d91167004045bd74cd0e065b1c4355a6b;hpb=18701a2fcad5171b03a76ceda18702831eb90850;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index dbcf4b8..56d2599 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2008 Index Data + 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 @@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_CONFIG_H #include #endif +#ifdef WIN32 +#include +#endif #include #include @@ -29,34 +32,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "settings.h" #include -void child_handler(void *data) -{ - start_proxy(); - init_settings(); +#include - 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); +static char *path_override = 0; +static struct conf_config *sc_stop_config = 0; +void child_handler(void *data) +{ + struct conf_config *config = (struct conf_config *) data; + config_read_settings(config, path_override); pazpar2_event_loop(); - } 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 HAVE_ICU +#if YAZ_HAVE_ICU printf(" icu:?"); #endif printf(" yaz:%s", yaz_version_str); @@ -64,7 +66,23 @@ static void show_version(void) exit(0); } -int main(int argc, char **argv) +#ifdef WIN32 +static int tcpip_init (void) +{ + WORD requested; + WSADATA wd; + + requested = MAKEWORD(1, 1); + if (WSAStartup(requested, &wd)) + return 0; + return 1; +} +#endif + + +static int sc_main( + yaz_sc_t s, + int argc, char **argv) { int daemon = 0; int ret; @@ -72,18 +90,22 @@ int main(int argc, char **argv) char *arg; 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"); -#if YAZ_VERSIONL >= 0x03001B yaz_log_xml_errors(0, YLOG_WARN); -#endif - while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2) + while ((ret = options("dDf:h:l:p:t:T:u:VX", argv, argc, &arg)) != -2) { switch (ret) { @@ -94,11 +116,13 @@ int main(int argc, char **argv) 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); @@ -108,7 +132,17 @@ int main(int argc, char **argv) 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; @@ -127,11 +161,16 @@ int main(int argc, char **argv) " -l file log to file\n" " -p pidfile PID file\n" " -t settings\n" + " -T session_timeout\n" " -u uid\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; } } @@ -140,29 +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(); yaz_daemon("pazpar2", (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) + (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE, - child_handler, 0 /* child_data */, + 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 */ +