/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 Index Data
+ Copyright (C) 2006-2013 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
static void show_version(void)
{
char yaz_version_str[80];
- printf("Pazpar2 " PACKAGE_VERSION
+ printf("Pazpar2 " PACKAGE_VERSION
#ifdef PAZPAR2_VERSION_SHA1
" "
PAZPAR2_VERSION_SHA1
printf(" yaz:%s", yaz_version_str);
printf("\n");
exit(0);
-}
+}
#ifdef WIN32
static int tcpip_init (void)
static int sc_main(
- yaz_sc_t s,
+ yaz_sc_t s,
int argc, char **argv)
{
int daemon = 0;
yaz_log_init_prefix("pazpar2");
yaz_log_xml_errors(0, YLOG_WARN);
- while ((ret = options("dDf:h:l:p:R:tu:v:VX", argv, argc, &arg)) != -2)
+ while ((ret = options("dDf:h:l:m:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2)
{
switch (ret)
{
yaz_log_init_file(arg);
log_file_in_use = 1;
break;
+ case 'm':
+ yaz_log_time_format(arg);
+ break;
case 'p':
pidfile = arg;
break;
#else
chdir
#endif
- (arg))
+ (arg))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "chdir %s", arg);
return 1;
" -f configfile Configuration\n"
" -h [host:]port Listener port\n"
" -l file Log to file\n"
+ " -m logformat log time format (strftime)\n"
" -p pidfile PID file\n"
" -R recfile HTTP recording file\n"
" -t Test configuration\n"
return 1;
}
pazpar2_mutex_init();
-
+
config = config_create(config_fname, global_parameters.dump_records);
if (!config)
return 1;
}
else
{
- yaz_log(YLOG_LOG, "Pazpar2 " VERSION " "
+ yaz_log(YLOG_LOG, "Pazpar2 start " VERSION " "
#ifdef PAZPAR2_VERSION_SHA1
PAZPAR2_VERSION_SHA1
#else
"-"
#endif
- " started");
+ );
+ ret = 0;
if (daemon && !log_file_in_use)
{
yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
"mode");
- return 1;
+ ret = 1;
+ }
+ if (!ret)
+ ret = config_start_listeners(config, listener_override,
+ record_fname);
+ if (!ret)
+ {
+ 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);
}
- ret = config_start_listeners(config, listener_override, record_fname);
- 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);
+ yaz_log(YLOG_LOG, "Pazpar2 stop");
+ return ret;
}
return 0;
}
{
int ret;
yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
-
+
#ifdef MTRACE
mtrace();
#endif