From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 20 Feb 2013 12:40:55 +0000 (+0100)
Subject: Change log msg for Pazpart start/stop
X-Git-Tag: v1.6.26~9^2
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=ee8fdc432afecf9397c9f1685a0ad02105736879;p=pazpar2-moved-to-github.git

Change log msg for Pazpart start/stop

Now using same style as Metaproxy, ie
 Pazpar2 start SHA1 / Pazpar2 stop .
---

diff --git a/src/pazpar2.c b/src/pazpar2.c
index b580120..80a7f59 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -215,30 +215,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;
 }