bool enable_cproxy;
bool enable_explain;
xmlDoc *explain_doc;
+ std::string m_proxy;
public:
Backend();
~Backend();
int *error,
char **addinfo,
mp::odr &odr,
- int *proxy_step,
- std::string &proxy);
+ int *proxy_step);
bool create_content_session(mp::Package &package,
BackendPtr b,
ODR odr, BackendPtr b,
Odr_oid *preferredRecordSyntax,
const char *element_set_name);
-
+ bool retry(mp::Package &package,
+ mp::odr &odr,
+ BackendPtr b,
+ int &error, char **addinfo,
+ int &proxy_step, int &same_retries,
+ int &proxy_retries);
void log_diagnostic(mp::Package &package,
int error, const char *addinfo);
public:
private:
void configure_local_records(const xmlNode * ptr, bool test_only);
bool check_proxy(const char *proxy);
+
+
+
FrontendPtr get_frontend(mp::Package &package);
void release_frontend(mp::Package &package);
SearchablePtr parse_torus_record(const xmlNode *ptr);
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
mp::Package &package,
std::string &database, int *error, char **addinfo, mp::odr &odr,
- int *proxy_step, std::string &proxy)
+ int *proxy_step)
{
- proxy.clear();
+ bool connection_reuse = false;
+ std::string proxy;
+
std::list<BackendPtr>::const_iterator map_it;
if (m_backend && !m_backend->enable_explain &&
m_backend->m_frontend_database == database)
{
- m_backend->connect("", error, addinfo, odr);
- return m_backend;
+ connection_reuse = true;
+ proxy = m_backend->m_proxy;
}
std::string input_args;
char **dstr;
int dnum = 0;
nmem_strsplit(((ODR) odr)->mem, ",", value, &dstr, &dnum);
- if (*proxy_step >= dnum)
- *proxy_step = 0;
+ if (connection_reuse)
+ {
+ // find the step after our current proxy
+ int i;
+ for (i = 0; i < dnum; i++)
+ if (!strcmp(proxy.c_str(), dstr[i]))
+ break;
+ if (i >= dnum - 1)
+ *proxy_step = 0;
+ else
+ *proxy_step = i + 1;
+ }
else
{
- proxy = dstr[*proxy_step];
-
- (*proxy_step)++;
- if (*proxy_step == dnum)
+ // step is known.. Guess our proxy from it
+ if (*proxy_step >= dnum)
*proxy_step = 0;
+ else
+ {
+ proxy = dstr[*proxy_step];
+
+ (*proxy_step)++;
+ if (*proxy_step == dnum)
+ *proxy_step = 0;
+ }
}
}
else if (!strcmp(name, "cproxysession"))
*addinfo = msg;
return notfound;
}
+ }
+ if (proxy.length())
+ package.log("zoom", YLOG_LOG, "proxy: %s", proxy.c_str());
+
+ if (connection_reuse)
+ {
+ m_backend->connect("", error, addinfo, odr);
+ return m_backend;
}
+
if (param_user)
{
authentication = std::string(param_user);
BackendPtr b(new Backend);
+ b->m_proxy = proxy;
b->sptr = sptr;
b->xsp = xsp;
b->m_frontend_database = database;
if (proxy.length())
b->set_option("proxy", proxy);
}
- if (proxy.length())
- package.log("zoom", YLOG_LOG, "proxy: %s", proxy.c_str());
-
std::string url;
if (sptr->sru.length())
{
yaz_poll_add(pfd.input_mask, yaz_poll_except);
if (cs->io_pending && CS_WANT_WRITE)
yaz_poll_add(pfd.input_mask, yaz_poll_write);
- else if (cs->io_pending & CS_WANT_READ)
+ if (cs->io_pending & CS_WANT_READ)
yaz_poll_add(pfd.input_mask, yaz_poll_read);
pfd.fd = cs_fileno(cs);
if (!wait_conn(conn, proxy_timeout))
break;
}
+ if (ret == 0)
+ outcome = true;
}
}
cs_close(conn);
return outcome;
}
+bool yf::Zoom::Frontend::retry(mp::Package &package,
+ mp::odr &odr,
+ BackendPtr b,
+ int &error, char **addinfo,
+ int &proxy_step, int &same_retries,
+ int &proxy_retries)
+{
+ if (b && b->m_proxy.length() && !m_p->check_proxy(b->m_proxy.c_str()))
+ {
+ log_diagnostic(package, error, *addinfo);
+ package.log("zoom", YLOG_LOG, "proxy %s fails", b->m_proxy.c_str());
+ m_backend.reset();
+ if (proxy_step) // there is a failover
+ {
+ proxy_retries++;
+ package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
+ return true;
+ }
+ error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR;
+ *addinfo = odr_strdup(odr, "proxy failure");
+ }
+ else if (same_retries == 0 && proxy_retries == 0)
+ {
+ log_diagnostic(package, error, *addinfo);
+ same_retries++;
+ package.log("zoom", YLOG_WARN, "search failed: retry");
+ m_backend.reset();
+ proxy_step = 0;
+ return true;
+ }
+ return false;
+}
+
void yf::Zoom::Frontend::handle_search(mp::Package &package)
{
Z_GDU *gdu = package.request().get();
int error = 0;
char *addinfo = 0;
std::string db(sr->databaseNames[0]);
- std::string proxy;
BackendPtr b = get_backend_from_databases(package, db, &error,
- &addinfo, odr, &proxy_step,
- proxy);
-
+ &addinfo, odr, &proxy_step);
if (error)
{
- if (proxy.length() && !m_p->check_proxy(proxy.c_str()))
- {
- if (proxy_step) // there is a failover
- {
- proxy_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
- m_backend.reset();
- goto next_proxy;
- }
- error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- addinfo = odr_strdup(odr, "proxy failure");
- }
- else if (same_retries == 0 && proxy_retries == 0)
- {
- same_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying first proxy");
- m_backend.reset();
- proxy_step = 0;
+ if (retry(package, odr, b, error, &addinfo, proxy_step,
+ same_retries, proxy_retries))
goto next_proxy;
- }
}
if (error)
{
if (error)
{
- if (proxy.length() && !m_p->check_proxy(proxy.c_str()))
- {
- if (proxy_step) // there is a failover
- {
- proxy_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
- m_backend.reset();
- goto next_proxy;
- }
- error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- addinfo = odr_strdup(odr, "proxy failure");
- }
- else if (same_retries == 0 && proxy_retries == 0)
- {
- same_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying first proxy");
- m_backend.reset();
- proxy_step = 0;
+ if (retry(package, odr, b, error, &addinfo, proxy_step,
+ same_retries, proxy_retries))
goto next_proxy;
- }
}
const char *element_set_name = 0;
projects / metaproxy-moved-to-github.git / blobdiff