metaproxy daemon: option -t tests configuration

diff --git a/doc/metaproxy.xml b/doc/metaproxy.xml
index 6a5c31b..09ca3fe 100644 (file)
--- a/doc/metaproxy.xml
+++ b/doc/metaproxy.xml
@@ -33,6 +33,7 @@
    <arg choice="opt"><option>-D</option></arg>
    <arg choice="opt"><option>-l <replaceable>logfile</replaceable></option></arg>
    <arg choice="opt"><option>-p <replaceable>pidfile</replaceable></option></arg>
+   <arg choice="opt"><option>-t</option></arg>
    <arg choice="opt"><option>-u <replaceable>ID</replaceable></option></arg>
    <arg choice="opt"><option>-w <replaceable>dir</replaceable></option></arg>
    <arg choice="opt"><option>-X</option></arg>
@@ -93,6 +94,13 @@
    </varlistentry>
 
    <varlistentry>
+    <term>-t</term>
+    <listitem><para>
+      Tests configuration. Returns exit code 0 on success; non-zero on failure.
+     </para></listitem>
+   </varlistentry>
+
+   <varlistentry>
     <term>-u <replaceable>ID</replaceable></term>
     <listitem><para>
       Makes Metaproxy changes its identity to ID after startup.

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 5306b9d..9d61db1 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -83,6 +83,7 @@ static int sc_main(
     yaz_sc_t s,
     int argc, char **argv)
 {
+    bool test_config = false;
     const char *fname = 0;
     int ret;
     char *arg;
@@ -90,7 +91,7 @@ static int sc_main(
     const char *pidfile = 0;
     const char *uid = 0;
     
-    while ((ret = options("c{config}:Dh{help}l:p:u:V{version}w:X", 
+    while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X", 
                           argv, argc, &arg)) != -2)
     {
         switch (ret)
@@ -109,6 +110,7 @@ static int sc_main(
                 " -D            daemon and keepalive operation\n"
                 " -l f          log file f\n"
                 " -p f          pid file f\n"
+                " -t            test configuration\n"
                 " -u id         change uid to id\n"
                 " -w dir        changes working directory to dir\n"
                 " -X            debug mode (no fork/daemon mode)\n"
@@ -125,6 +127,9 @@ static int sc_main(
         case 'p':
             pidfile = arg;
             break;
+        case 't':
+            test_config = true;
+            break;
         case 'u':
             uid = arg;
             break;
@@ -200,13 +205,15 @@ static int sc_main(
     try {
         mp::FactoryStatic factory;
         mp::RouterFleXML *router =
-            new mp::RouterFleXML(doc, factory, false, wrbuf_cstr(base_path));
-        wrbuf_destroy(base_path);
-        
-        yaz_sc_running(s);
-        
-        yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
-                   handler_debug : handler_normal, router, pidfile, uid);
+            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 ?
+                       handler_debug : handler_normal, router, pidfile, uid);
+        }
     }
     catch (std::logic_error &e) {
         yaz_log (YLOG_FATAL,"std::logic error: %s" , e.what() );