projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix session_shared caches set with diagnostic MP-604
[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
ec0e78e
..
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.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2013 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
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
@@
-63,6
+63,7
@@
namespace metaproxy_1 {
std::string m_stat_req;
yazpp_1::SocketManager mySocketManager;
ZAssocServer **az;
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;
int m_duration_freq[22];
double m_duration_lim[22];
double m_duration_max;
@@
-89,10
+90,10
@@
namespace metaproxy_1 {
ZAssocChild(yazpp_1::IPDU_Observable *the_PDU_Observable,
mp::ThreadPoolSocketObserver *m_thread_pool_observer,
const mp::Package *package,
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;
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,
private:
yazpp_1::IPDU_Observer* sessionNotify(
yazpp_1::IPDU_Observable *the_PDU_Observable,
@@
-129,7
+130,7
@@
namespace metaproxy_1 {
public:
~ZAssocServer();
ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable,
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);
Rep *rep);
void set_package(const mp::Package *package);
void set_thread_pool(ThreadPoolSocketObserver *observer);
@@
-146,7
+147,7
@@
namespace metaproxy_1 {
mp::ThreadPoolSocketObserver *m_thread_pool_observer;
const mp::Package *m_package;
yazpp_1::LimitConnect limit_connect;
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;
};
}
Rep *m_p;
};
}
@@
-258,7
+259,7
@@
void yf::FrontendNet::ThreadPoolPackage::result(const char *t_info)
mp::IThreadPoolMsg *yf::FrontendNet::ThreadPoolPackage::handle()
{
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;
}
return this;
}
@@
-266,18
+267,28
@@
yf::FrontendNet::ZAssocChild::ZAssocChild(
yazpp_1::IPDU_Observable *PDU_Observable,
mp::ThreadPoolSocketObserver *my_thread_pool,
const mp::Package *package,
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;
: 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";
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);
}
timeout(m_p->m_session_timeout);
}
@@
-430,10
+441,10
@@
void yf::FrontendNet::ZAssocChild::connectNotify()
yf::FrontendNet::ZAssocServer::ZAssocServer(
yazpp_1::IPDU_Observable *PDU_Observable,
yf::FrontendNet::ZAssocServer::ZAssocServer(
yazpp_1::IPDU_Observable *PDU_Observable,
- std::string route,
+ Port *port,
Rep *rep)
:
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;
}
{
m_package = 0;
}
@@
-465,7
+476,7
@@
yazpp_1::IPDU_Observer *yf::FrontendNet::ZAssocServer::sessionNotify(
}
ZAssocChild *my = new ZAssocChild(the_PDU_Observable,
m_thread_pool_observer,
}
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;
}
return my;
}
@@
-539,6
+550,7
@@
yf::FrontendNet::Rep::~Rep()
for (i = 0; i < m_ports.size(); i++)
delete az[i];
delete [] az;
for (i = 0; i < m_ports.size(); i++)
delete az[i];
delete [] az;
+ delete [] pdu;
}
az = 0;
}
}
az = 0;
}
@@
-594,9
+606,24
@@
void yf::FrontendNet::process(mp::Package &package) const
while (m_p->mySocketManager.processEvent() > 0)
{
if (m_p->m_stop_signo == SIGTERM)
while (m_p->mySocketManager.processEvent() > 0)
{
if (m_p->m_stop_signo == SIGTERM)
+ {
+ 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 */
break; /* stop right away */
+ }
+#ifndef WIN32
if (m_p->m_stop_signo == SIGUSR1)
{ /* just stop listeners and cont till all sessions are done*/
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)
{
m_p->m_stop_signo = 0;
if (m_p->az)
{
@@
-606,6
+633,7
@@
void yf::FrontendNet::process(mp::Package &package) const
yaz_daemon_stop();
}
}
yaz_daemon_stop();
}
}
+#endif
int no = m_p->mySocketManager.getNumberOfObservers();
if (no <= 1)
break;
int no = m_p->mySocketManager.getNumberOfObservers();
if (no <= 1)
break;
@@
-712,10
+740,13
@@
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->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;
// 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);
{
// create a PDU assoc object (one per yf::FrontendNet::ZAssocServer)
yazpp_1::PDU_Assoc *as = new yazpp_1::PDU_Assoc(&m_p->mySocketManager);
@@
-723,8
+754,9
@@
void yf::FrontendNet::set_ports(std::vector<Port> &ports)
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
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(
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 "
if (m_p->az[i]->server(m_p->m_ports[i].port.c_str()))
{
throw yf::FilterException("Unable to bind to address "