summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a69aab7)
Also log the diagnostic that is received from the backend in
case of retry/failover because they will be not be returned
via Z39.50/SRU.
bool enable_cproxy;
bool enable_explain;
xmlDoc *explain_doc;
bool enable_cproxy;
bool enable_explain;
xmlDoc *explain_doc;
public:
Backend();
~Backend();
public:
Backend();
~Backend();
int *error,
char **addinfo,
mp::odr &odr,
int *error,
char **addinfo,
mp::odr &odr,
- int *proxy_step,
- std::string &proxy);
bool create_content_session(mp::Package &package,
BackendPtr b,
bool create_content_session(mp::Package &package,
BackendPtr b,
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
mp::Package &package,
std::string &database, int *error, char **addinfo, mp::odr &odr,
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)
+ 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)
{
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;
}
std::string input_args;
char **dstr;
int dnum = 0;
nmem_strsplit(((ODR) odr)->mem, ",", value, &dstr, &dnum);
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;
+ }
- proxy = dstr[*proxy_step];
-
- (*proxy_step)++;
- if (*proxy_step == dnum)
+ // step is known.. Guess our proxy from it
+ if (*proxy_step >= dnum)
+ else
+ {
+ proxy = dstr[*proxy_step];
+
+ (*proxy_step)++;
+ if (*proxy_step == dnum)
+ *proxy_step = 0;
+ }
}
}
else if (!strcmp(name, "cproxysession"))
}
}
else if (!strcmp(name, "cproxysession"))
*addinfo = msg;
return notfound;
}
*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);
if (param_user)
{
authentication = std::string(param_user);
BackendPtr b(new Backend);
BackendPtr b(new Backend);
b->sptr = sptr;
b->xsp = xsp;
b->m_frontend_database = database;
b->sptr = sptr;
b->xsp = xsp;
b->m_frontend_database = database;
if (proxy.length())
b->set_option("proxy", proxy);
}
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())
{
std::string url;
if (sptr->sru.length())
{
int error = 0;
char *addinfo = 0;
std::string db(sr->databaseNames[0]);
int error = 0;
char *addinfo = 0;
std::string db(sr->databaseNames[0]);
BackendPtr b = get_backend_from_databases(package, db, &error,
BackendPtr b = get_backend_from_databases(package, db, &error,
- &addinfo, odr, &proxy_step,
- proxy);
-
+ &addinfo, odr, &proxy_step);
- if (proxy.length() && !m_p->check_proxy(proxy.c_str()))
+ 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");
if (proxy_step) // there is a failover
{
proxy_retries++;
package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
goto next_proxy;
}
error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR;
goto next_proxy;
}
error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR;
}
else if (same_retries == 0 && proxy_retries == 0)
{
}
else if (same_retries == 0 && proxy_retries == 0)
{
+ log_diagnostic(package, error, addinfo);
- package.log("zoom", YLOG_WARN, "search failed: trying first proxy");
+ package.log("zoom", YLOG_WARN, "search failed: retry");
m_backend.reset();
proxy_step = 0;
goto next_proxy;
m_backend.reset();
proxy_step = 0;
goto next_proxy;
- if (proxy.length() && !m_p->check_proxy(proxy.c_str()))
+ if (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");
if (proxy_step) // there is a failover
{
proxy_retries++;
package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
goto next_proxy;
}
error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR;
addinfo = odr_strdup(odr, "proxy failure");
}
else if (same_retries == 0 && proxy_retries == 0)
goto next_proxy;
}
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);
- package.log("zoom", YLOG_WARN, "search failed: trying first proxy");
+ package.log("zoom", YLOG_WARN, "search failed: retry");
m_backend.reset();
proxy_step = 0;
goto next_proxy;
m_backend.reset();
proxy_step = 0;
goto next_proxy;