From dbb4fed696a1bc6723994e608514d4b389acbda9 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 11 May 2009 10:53:19 +0200 Subject: [PATCH] Z39.50 client. Fail immediately if all max-sockets con. are busy. The Z39.50 client now fails immediately if all max-sockets sockets are in use.. Only if at least one is not in use, it will wait 15 seconds and to check if a connection has been freed up. --- src/filter_z3950_client.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index 70f7703..47de1a7 100644 --- a/src/filter_z3950_client.cpp +++ b/src/filter_z3950_client.cpp @@ -304,17 +304,32 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) while (max_sockets) { + int no_not_in_use = 0; int number = 0; it = m_clients.begin(); for (; it != m_clients.end(); it++) { yf::Z3950Client::Assoc *as = it->second; if (!strcmp(as->get_hostname(), host.c_str())) + { number++; + if (!as->m_in_use) + no_not_in_use++; + } } - yaz_log(YLOG_LOG, "Found %d connections for %s", number, host.c_str()); + yaz_log(YLOG_LOG, "Found %d/%d connections for %s", number, max_sockets, + host.c_str()); if (number < max_sockets) break; + if (no_not_in_use == 0) // all in use.. + { + mp::odr odr; + + package.response() = odr.create_initResponse( + apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "max sessions"); + package.session().close(); + return 0; + } boost::xtime xt; xtime_get(&xt, boost::TIME_UTC); -- 1.7.10.4