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
Version 1.1.7
[metaproxy-moved-to-github.git]
/
src
/
filter_z3950_client.cpp
diff --git
a/src/filter_z3950_client.cpp
b/src/filter_z3950_client.cpp
index
16bd377
..
683c09a
100644
(file)
--- a/
src/filter_z3950_client.cpp
+++ b/
src/filter_z3950_client.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 Index Data
+ Copyright (C) 2005-2010 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
@@
-18,10
+18,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "config.hpp"
#include "config.hpp"
-#include "filter.hpp"
-#include "package.hpp"
-#include "util.hpp"
#include "filter_z3950_client.hpp"
#include "filter_z3950_client.hpp"
+#include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
#include <map>
#include <stdexcept>
#include <map>
#include <stdexcept>
@@
-274,7
+273,7
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
package.response() = odr.create_initResponse(
apdu,
YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
package.response() = odr.create_initResponse(
apdu,
YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
- "z3950_client: No virtal host given");
+ "z3950_client: No vhost given");
package.session().close();
return 0;
package.session().close();
return 0;
@@
-304,17
+303,32
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
while (max_sockets)
{
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;
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()))
+ if (!strcmp(as->m_host.c_str(), host.c_str()))
+ {
number++;
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 (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);
boost::xtime xt;
xtime_get(&xt, boost::TIME_UTC);
@@
-477,8
+491,9
@@
extern "C" {
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+