proxy.sh start/stop script

[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 9b7ffc5..e8d594f 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,10 +1,12 @@
 /*
- * 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.18 2002-10-23 10:15:18 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.21 2003-10-23 09:08:52 adam Exp $
  */
 
+#include <signal.h>
+#include <unistd.h>
 #include <yaz/log.h>
 #include <yaz/options.h>
 
@@ -14,11 +16,12 @@
 
 void usage(char *prog)
 {
-    fprintf (stderr, "%s: [-a log] [-c num] [-v level] [-t target] [-i sec] "
+    fprintf (stderr, "%s: [-c config] [-a log] [-m num] [-v level] [-t target] [-i sec] "
              "[-u auth] [-o optlevel] @:port\n", prog);
     exit (1);
 }
 
+static char *pid_fname = 0;
 
 int args(Yaz_Proxy *proxy, int argc, char **argv)
 {
@@ -27,8 +30,9 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     char *prog = argv[0];
     int ret;
 
-    while ((ret = options("o:a:t:v:c:u:i:", argv, argc, &arg)) != -2)
+    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:", argv, argc, &arg)) != -2)
     {
+       int err;
         switch (ret)
         {
         case 0:
@@ -39,11 +43,24 @@ 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_proxy_target(arg);
+           proxy->set_default_target(arg);
            break;
         case 'u':
             proxy->set_proxy_authentication(arg);
@@ -54,11 +71,21 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
        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_idletime(atoi(arg));
+           proxy->set_client_idletime(atoi(arg));
+           break;
+        case 'T':
+           proxy->set_target_idletime(atoi(arg));
+           break;
+       case 'p':
+           if (!pid_fname)
+               pid_fname = xstrdup(arg);
            break;
         default:
            usage(prog);
@@ -77,14 +104,43 @@ 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)
 {
+    static int mk_pid = 0;
     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)
-       ;
+       if (!mk_pid && pid_fname)
+       {
+           FILE *f = fopen(pid_fname, "w");
+           if (!f)
+           {
+               yaz_log(LOG_ERRNO|LOG_FATAL, "Couldn't create %s", pid_fname);
+               exit(0);
+           }
+           fprintf(f, "%ld", (long) getpid());
+           fclose(f);
+           mk_pid = 1;
+       }
+    if (pid_fname)
+    {
+       if (mk_pid)
+           unlink(pid_fname);
+       xfree(pid_fname);
+    }
     exit (0);
     return 0;
 }