X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=24526d07ed24ff7525a3ba94a09d47f6c3578aeb;hb=77fc683f33da2f7679d0372d9cd32a111baedfc6;hp=b5801205f2ea8d07aa22be767979159ee2a2812e;hpb=2bd14321370e2d042c370d19149d6caec9c01930;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index b580120..24526d0 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2013 Index Data
+   Copyright (C) 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
@@ -118,7 +118,7 @@ static int sc_main(
     yaz_log_init_prefix("pazpar2");
     yaz_log_xml_errors(0, YLOG_WARN);
 
-    while ((ret = options("dDf:h:l:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2)
+    while ((ret = options("dDf:h:l:m:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
@@ -138,6 +138,9 @@ static int sc_main(
             yaz_log_init_file(arg);
             log_file_in_use = 1;
             break;
+        case 'm':
+            yaz_log_time_format(arg);
+            break;
         case 'p':
             pidfile = arg;
             break;
@@ -181,6 +184,7 @@ static int sc_main(
                     "    -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"
@@ -215,30 +219,34 @@ static int sc_main(
     }
     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;
         }
-        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);
+        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);
+        }
+        yaz_log(YLOG_LOG, "Pazpar2 stop");
+        return ret;
     }
     return 0;
 }