X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=dbcf4b8d91167004045bd74cd0e065b1c4355a6b;hb=18701a2fcad5171b03a76ceda18702831eb90850;hp=d1ecf1510b39fc1a4ae4aa6cbbbf343eecfe3c85;hpb=9856b661bf3d99be5b397040d3163e769a3e360b;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index d1ecf15..dbcf4b8 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,7 +1,5 @@ -/* $Id: pazpar2.c,v 1.81 2007-04-20 16:21:19 quinn Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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,70 +12,136 @@ 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 - #include +#include #include "pazpar2.h" #include "database.h" #include "settings.h" +#include + +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); + + + pazpar2_event_loop(); + +} + +static void show_version(void) +{ + char yaz_version_str[80]; + printf("Pazpar2 " PACKAGE_VERSION "\n"); + + yaz_version(yaz_version_str, 0); + + printf("Configuration:"); +#if HAVE_ICU + printf(" icu:?"); +#endif + printf(" yaz:%s", yaz_version_str); + printf("\n"); + exit(0); +} int main(int argc, char **argv) { + int daemon = 0; int ret; + int log_file_in_use = 0; char *arg; + const char *pidfile = 0; + const char *uid = 0; +#ifndef WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) yaz_log(YLOG_WARN|YLOG_ERRNO, "signal"); +#endif - yaz_log_init(YLOG_DEFAULT_LEVEL, "pazpar2", 0); + yaz_log_init_prefix("pazpar2"); +#if YAZ_VERSIONL >= 0x03001B + yaz_log_xml_errors(0, YLOG_WARN); +#endif - while ((ret = options("t:f:x:h:p:z:s:d", argv, argc, &arg)) != -2) + while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2) { - switch (ret) { - case 'f': - if (!read_config(arg)) - exit(1); - break; - case 'h': - strcpy(global_parameters.listener_override, arg); - break; - case 'p': - strcpy(global_parameters.proxy_override, arg); - break; - case 'z': - strcpy(global_parameters.zproxy_override, arg); - break; - case 't': - strcpy(global_parameters.settings_path_override, arg); - break; - case 's': - load_simpletargets(arg); - break; - case 'd': - global_parameters.dump_records = 1; - break; - default: - fprintf(stderr, "Usage: pazpar2\n" - " -f configfile\n" - " -h [host:]port (REST protocol listener)\n" - " -C cclconfig\n" - " -s simpletargetfile\n" - " -p hostname[:portno] (HTTP proxy)\n" - " -z hostname[:portno] (Z39.50 proxy)\n" - " -d (show internal records)\n"); - exit(1); + switch (ret) + { + case 'd': + global_parameters.dump_records = 1; + break; + case 'D': + daemon = 1; + break; + case 'f': + if (!read_config(arg)) + exit(1); + break; + case 'h': + strcpy(global_parameters.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); + break; + case 'u': + uid = arg; + 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" + " -u uid\n" + " -V show version\n" + " -X debug mode\n" + ); + exit(1); } } + yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION); + if (daemon && !log_file_in_use) + { + yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon " + "mode"); + exit(1); + } if (!config) { yaz_log(YLOG_FATAL, "Load config with -f"); @@ -86,23 +150,15 @@ int main(int argc, char **argv) global_parameters.server = config->servers; start_http_listener(); - start_proxy(); - start_zproxy(); - - 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. Problems may well ensue!"); - global_parameters.odr_in = odr_createmem(ODR_DECODE); - global_parameters.odr_out = odr_createmem(ODR_ENCODE); - - pazpar2_event_loop(); - + 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; } + /* * Local variables: * c-basic-offset: 4