Fix Metaproxy stops logging after check config failed MP-590

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

diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp
index da98215..7ef28c8 100644 (file)
--- a/src/filter_frontend_net.cpp
+++ b/src/filter_frontend_net.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/log.h>
 #include <yaz/daemon.h>
 #include "gduutil.hpp"
+#include <signal.h>
 
 #include <iostream>
 
@@ -47,6 +48,7 @@ namespace metaproxy_1 {
             friend class FrontendNet;
             std::string port;
             std::string route;
+            std::string cert_fname;
             int max_recv_bytes;
         };
         class FrontendNet::Rep {
@@ -61,12 +63,13 @@ namespace metaproxy_1 {
             std::string m_stat_req;
             yazpp_1::SocketManager mySocketManager;
             ZAssocServer **az;
+            yazpp_1::PDU_Assoc **pdu;
             int m_duration_freq[22];
             double m_duration_lim[22];
             double m_duration_max;
             double m_duration_min;
             double m_duration_total;
-            bool m_stop;
+            int m_stop_signo;
         public:
             Rep();
             ~Rep();
@@ -87,10 +90,10 @@ namespace metaproxy_1 {
             ZAssocChild(yazpp_1::IPDU_Observable *the_PDU_Observable,
                         mp::ThreadPoolSocketObserver *m_thread_pool_observer,
                         const mp::Package *package,
-                        std::string route,
+                        Port *port,
                         Rep *rep);
             int m_no_requests;
-            std::string m_route;
+            Port *m_port;
         private:
             yazpp_1::IPDU_Observer* sessionNotify(
                 yazpp_1::IPDU_Observable *the_PDU_Observable,
@@ -127,7 +130,7 @@ namespace metaproxy_1 {
         public:
             ~ZAssocServer();
             ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
-                         std::string route,
+                         FrontendNet::Port *port,
                          Rep *rep);
             void set_package(const mp::Package *package);
             void set_thread_pool(ThreadPoolSocketObserver *observer);
@@ -144,7 +147,7 @@ namespace metaproxy_1 {
             mp::ThreadPoolSocketObserver *m_thread_pool_observer;
             const mp::Package *m_package;
             yazpp_1::LimitConnect limit_connect;
-            std::string m_route;
+            Port *m_port;
             Rep *m_p;
         };
     }
@@ -256,7 +259,7 @@ void yf::FrontendNet::ThreadPoolPackage::result(const char *t_info)
 
 mp::IThreadPoolMsg *yf::FrontendNet::ThreadPoolPackage::handle()
 {
-    m_package->move(m_assoc_child->m_route);
+    m_package->move(m_assoc_child->m_port->route);
     return this;
 }
 
@@ -264,18 +267,28 @@ yf::FrontendNet::ZAssocChild::ZAssocChild(
     yazpp_1::IPDU_Observable *PDU_Observable,
     mp::ThreadPoolSocketObserver *my_thread_pool,
     const mp::Package *package,
-    std::string route, Rep *rep)
+    Port *port, Rep *rep)
     :  Z_Assoc(PDU_Observable), m_p(rep)
 {
     m_thread_pool_observer = my_thread_pool;
     m_no_requests = 0;
     m_delete_flag = false;
     m_package = package;
-    m_route = route;
+    m_port = port;
     const char *peername = PDU_Observable->getpeername();
     if (!peername)
         peername = "unknown";
-    m_origin.set_tcpip_address(std::string(peername), m_session.id());
+    else
+    {
+        const char *cp = strchr(peername, ':');
+        if (cp)
+            peername = cp + 1;
+    }
+    std::string addr;
+    addr.append(peername);
+    addr.append(" ");
+    addr.append(port->port);
+    m_origin.set_tcpip_address(addr, m_session.id());
     timeout(m_p->m_session_timeout);
 }
 
@@ -428,10 +441,10 @@ void yf::FrontendNet::ZAssocChild::connectNotify()
 
 yf::FrontendNet::ZAssocServer::ZAssocServer(
     yazpp_1::IPDU_Observable *PDU_Observable,
-    std::string route,
+    Port *port,
     Rep *rep)
     :
-    Z_Assoc(PDU_Observable), m_route(route), m_p(rep)
+    Z_Assoc(PDU_Observable), m_port(port), m_p(rep)
 {
     m_package = 0;
 }
@@ -463,7 +476,7 @@ yazpp_1::IPDU_Observer *yf::FrontendNet::ZAssocServer::sessionNotify(
     }
     ZAssocChild *my = new ZAssocChild(the_PDU_Observable,
                                       m_thread_pool_observer,
-                                      m_package, m_route, m_p);
+                                      m_package, m_port, m_p);
     return my;
 }
 
@@ -526,7 +539,7 @@ yf::FrontendNet::Rep::Rep()
     m_duration_max = 0.0;
     m_duration_min = 0.0;
     m_duration_total = 0.0;
-    m_stop = false;
+    m_stop_signo = 0;
 }
 
 yf::FrontendNet::Rep::~Rep()
@@ -537,6 +550,7 @@ yf::FrontendNet::Rep::~Rep()
         for (i = 0; i < m_ports.size(); i++)
             delete az[i];
         delete [] az;
+        delete [] pdu;
     }
     az = 0;
 }
@@ -545,9 +559,9 @@ yf::FrontendNet::~FrontendNet()
 {
 }
 
-void yf::FrontendNet::stop() const
+void yf::FrontendNet::stop(int signo) const
 {
-    m_p->m_stop = true;
+    m_p->m_stop_signo = signo;
 }
 
 bool yf::FrontendNet::My_Timer_Thread::timeout()
@@ -591,17 +605,35 @@ void yf::FrontendNet::process(mp::Package &package) const
     }
     while (m_p->mySocketManager.processEvent() > 0)
     {
-        if (m_p->m_stop)
+        if (m_p->m_stop_signo == SIGTERM)
         {
-            m_p->m_stop = false;
+            yaz_log(YLOG_LOG, "metaproxy received SIGTERM");
             if (m_p->az)
             {
                 size_t i;
                 for (i = 0; i < m_p->m_ports.size(); i++)
+                {
+                    m_p->pdu[i]->shutdown();
                     m_p->az[i]->server("");
+                }
                 yaz_daemon_stop();
             }
+            break; /* stop right away */
         }
+#ifndef WIN32
+        if (m_p->m_stop_signo == SIGUSR1)
+        {    /* just stop listeners and cont till all sessions are done*/
+            yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
+            m_p->m_stop_signo = 0;
+            if (m_p->az)
+            {
+                size_t i;
+                for (i = 0; i < m_p->m_ports.size(); i++)
+                    m_p->az[i]->server("");
+                yaz_daemon_stop();
+            }
+        }
+#endif
         int no = m_p->mySocketManager.getNumberOfObservers();
         if (no <= 1)
             break;
@@ -627,8 +659,9 @@ void yf::FrontendNet::configure(const xmlNode * ptr, bool test_only,
         {
             Port port;
 
-            const char *names[4] = {"route", "max_recv_bytes", "port", 0};
-            std::string values[3];
+            const char *names[5] = {"route", "max_recv_bytes", "port",
+                                    "cert_fname", 0};
+            std::string values[4];
 
             mp::xml::parse_attr(ptr, names, values);
             port.route = values[0];
@@ -640,6 +673,7 @@ void yf::FrontendNet::configure(const xmlNode * ptr, bool test_only,
                 port.port = values[2];
             else
                 port.port = mp::xml::get_text(ptr);
+            port.cert_fname = values[3];
             ports.push_back(port);
         }
         else if (!strcmp((const char *) ptr->name, "threads"))
@@ -706,17 +740,23 @@ void yf::FrontendNet::set_ports(std::vector<Port> &ports)
     m_p->m_ports = ports;
 
     m_p->az = new yf::FrontendNet::ZAssocServer *[m_p->m_ports.size()];
+    m_p->pdu = new yazpp_1::PDU_Assoc *[m_p->m_ports.size()];
 
     // Create yf::FrontendNet::ZAssocServer for each port
     size_t i;
-    for (i = 0; i<m_p->m_ports.size(); i++)
+    for (i = 0; i < m_p->m_ports.size(); i++)
+        m_p->az[i] = 0;
+    for (i = 0; i < m_p->m_ports.size(); i++)
     {
         // create a PDU assoc object (one per yf::FrontendNet::ZAssocServer)
         yazpp_1::PDU_Assoc *as = new yazpp_1::PDU_Assoc(&m_p->mySocketManager);
 
+        if (m_p->m_ports[i].cert_fname.length())
+            as->set_cert_fname(m_p->m_ports[i].cert_fname.c_str());
         // create ZAssoc with PDU Assoc
+        m_p->pdu[i] = as;
         m_p->az[i] = new yf::FrontendNet::ZAssocServer(
-            as, m_p->m_ports[i].route, m_p.get());
+            as, &m_p->m_ports[i], m_p.get());
         if (m_p->az[i]->server(m_p->m_ports[i].port.c_str()))
         {
             throw yf::FilterException("Unable to bind to address "