Reformat: delete trailing whitespace

[metaproxy-moved-to-github.git] / src / metaproxy_prog.cpp

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 7e25307..5a50f44 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -54,7 +54,6 @@ static void sig_usr1_handler(int s)
 {
     yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
     routerp->stop();
-    yaz_daemon_stop();
 }
 
 static void sig_term_handler(int s)
@@ -80,6 +79,7 @@ static void work_common(void *data)
     mp::Package pack;
     pack.router(*routerp).move();
     yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+    yaz_daemon_stop();
     _exit(0);
 }
 
@@ -87,7 +87,7 @@ static void work_debug(void *data)
 {
     work_common(data);
 }
-    
+
 static void work_normal(void *data)
 {
 #if HAVE_UNISTD_H
@@ -108,8 +108,8 @@ static int sc_main(
     unsigned mode = 0;
     const char *pidfile = 0;
     const char *uid = 0;
-    
-    while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X", 
+
+    while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X",
                           argv, argc, &arg)) != -2)
     {
         switch (ret)
@@ -136,7 +136,7 @@ static int sc_main(
                 " -install      install windows service\n"
                 " -remove       remove windows service\n"
 #endif
-                
+
                       << std::endl;
             break;
         case 'l':
@@ -166,7 +166,7 @@ static int sc_main(
 #else
                 chdir(arg)
 #endif
-                ) 
+                )
             {
                 std::cerr << "chdir " << arg << " failed" << std::endl;
                 return 1;
@@ -184,22 +184,23 @@ static int sc_main(
         std::cerr << "No configuration given; use -h for help\n";
         return 1;
     }
-    
-    yaz_log(YLOG_LOG, "metaproxy start " VERSION
+
+    if (!test_config)
+        yaz_log(YLOG_LOG, "metaproxy start " VERSION
 #ifdef VERSION_SHA1
-            " " VERSION_SHA1
+                " " VERSION_SHA1
 #endif
-        );
-    
+            );
+
     yaz_log_xml_errors(0, YLOG_LOG);
     xmlDocPtr doc = xmlReadFile(fname,
-                                NULL, 
+                                NULL,
                                 XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
                                 + XML_PARSE_NSCLEAN + XML_PARSE_NONET );
-    
+
     if (!doc)
     {
-        yaz_log (YLOG_FATAL,"XML parsing failed");
+        yaz_log(YLOG_FATAL,"XML parsing failed");
         return 1;
     }
     // and perform Xinclude then
@@ -228,15 +229,15 @@ static int sc_main(
             new mp::RouterFleXML(doc, factory, test_config, wrbuf_cstr(base_path));
         if (!test_config)
         {
-            
+
             yaz_sc_running(s);
-            
+
             yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
                        work_debug : work_normal, router, pidfile, uid);
         }
     }
     catch (std::logic_error &e) {
-        yaz_log (YLOG_FATAL,"std::logic error: %s" , e.what() );
+        yaz_log(YLOG_FATAL,"std::logic error: %s" , e.what() );
         ret = 1;
     }
     catch (std::runtime_error &e) {
@@ -267,8 +268,6 @@ int main(int argc, char **argv)
     exit(ret);
 }
 
-
-
 /*
  * Local variables:
  * c-basic-offset: 4