Log request number. More configurable keepalive with pdu/bw limits.

[yazpp-moved-to-github.git] / src / yaz-proxy-main.cpp

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 0487363..9daed93 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,24 +1,25 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy-main.cpp,v 1.14 2001-11-04 22:36:21 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.20 2003-10-09 12:11:10 adam Exp $
  */
 
+#include <signal.h>
 #include <yaz/log.h>
 #include <yaz/options.h>
 
-#include <yaz++/yaz-socket-manager.h>
-#include <yaz++/yaz-pdu-assoc.h>
-#include <yaz++/yaz-proxy.h>
+#include <yaz++/socket-manager.h>
+#include <yaz++/pdu-assoc.h>
+#include <yaz++/proxy.h>
 
 void usage(char *prog)
 {
-    fprintf (stderr, "%s: [-a log] [-c num] [-v level] [-t target] @:port\n", prog);
+    fprintf (stderr, "%s: [-c config] [-a log] [-m num] [-v level] [-t target] [-i sec] "
+             "[-u auth] [-o optlevel] @:port\n", prog);
     exit (1);
 }
 
-
 int args(Yaz_Proxy *proxy, int argc, char **argv)
 {
     char *addr = 0;
@@ -26,8 +27,9 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     char *prog = argv[0];
     int ret;
 
-    while ((ret = options("a:t:v:c:", argv, argc, &arg)) != -2)
+    while ((ret = options("o:a:t:v:c:u:i:m:l:T:", argv, argc, &arg)) != -2)
     {
+       int err;
         switch (ret)
         {
         case 0:
@@ -38,18 +40,46 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
            }
            addr = arg;
             break;
+       case 'c':
+           err = proxy->set_config(arg);
+           if (err == -2)
+           {
+               fprintf(stderr, "Config file support not enabled (proxy not compiled with libxml2 support)\n");
+               exit(1);
+           }
+           else if (err == -1)
+           {
+               fprintf(stderr, "Bad or missing file %s\n", arg);
+               exit(1);
+           }
+           break;
        case 'a':
            proxy->set_APDU_log(arg);
            break;
         case 't':
-           proxy->set_proxyTarget(arg);
+           proxy->set_default_target(arg);
+           break;
+        case 'u':
+            proxy->set_proxy_authentication(arg);
+            break;
+        case 'o':
+           proxy->option("optimize", arg);
            break;
        case 'v':
            yaz_log_init_level (yaz_log_mask_str(arg));
            break;
-       case 'c':
+       case 'l':
+           yaz_log_init_file (arg);
+           break;
+       case 'm':
            proxy->set_max_clients(atoi(arg));
            break;
+        case 'i':
+           proxy->set_client_idletime(atoi(arg));
+           break;
+        case 'T':
+           proxy->set_target_idletime(atoi(arg));
+           break;
         default:
            usage(prog);
            return 1;
@@ -67,11 +97,22 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     return 0;
 }
 
+static Yaz_Proxy *static_yaz_proxy = 0;
+static void sighup_handler(int num)
+{
+    if (static_yaz_proxy)
+       static_yaz_proxy->reconfig();
+}
+
 int main(int argc, char **argv)
 {
     Yaz_SocketManager mySocketManager;
     Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
 
+    static_yaz_proxy = &proxy;
+
+    signal(SIGHUP, sighup_handler);
+
     args(&proxy, argc, argv);
     while (mySocketManager.processEvent() > 0)
        ;