/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 Index Data
+ Copyright (C) 2006-2013 Index Data
Pazpar2 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
connection_use(-1);
}
-// Creates a new connection for client, associated with the host of
+// Creates a new connection for client, associated with the host of
// client's database
static struct connection *connection_create(struct client *cl,
struct host *host,
co->state = Conn_Closed;
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
-
+
if (host->ipport)
connection_connect(co, iochan_man);
if (!cl)
continue;
ev = ZOOM_connection_last_event(link);
-
+
#if 1
yaz_log(YLOG_DEBUG, "%p Connection ZOOM_EVENT_%s", co, ZOOM_get_event_str(ev));
#endif
- switch (ev)
+ switch (ev)
{
+ case ZOOM_EVENT_TIMEOUT:
+ break;
case ZOOM_EVENT_END:
{
const char *error, *addinfo;
{
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_id(cl));
- client_set_diagnostic(cl, err, addinfo);
+ client_set_diagnostic(cl, err, error, addinfo);
client_set_state(cl, Client_Error);
}
else
client_search_response(cl);
break;
case ZOOM_EVENT_RECV_RECORD:
- client_record_response(cl);
- got_records = 1;
+ client_record_response(cl, &got_records);
break;
default:
yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
ev, client_get_id(cl));
+ break;
}
}
if (got_records)
{
int r = ZOOM_connection_exec_task(co->link);
if (!r)
- {
- const char *error, *addinfo;
- int err;
- if ((err = ZOOM_connection_error(co->link, &error, &addinfo)))
- {
- if (co->client)
- {
- yaz_log(YLOG_LOG, "Error %s from %s",
- error, client_get_id(co->client));
- client_set_diagnostic(co->client, err, addinfo);
- client_set_state_nb(co->client, Client_Error);
- }
- }
- }
+ non_block_events(co);
else
{
iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
yaz_mutex_enter(host->mutex);
cl = co->client;
- if (!cl)
+ if (!cl)
{
/* no client associated with it.. We are probably getting
a closed connection from the target.. Or, perhaps, an unexpected
}
else if (event & EVENT_TIMEOUT)
{
- if (co->state == Conn_Connecting)
- {
- yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_id(cl));
+ ZOOM_connection_fire_event_timeout(co->link);
+ client_lock(cl);
+ non_block_events(co);
+ client_unlock(cl);
- client_set_state(cl, Client_Error);
- remove_connection_from_host(co);
- yaz_mutex_leave(host->mutex);
- connection_destroy(co);
- }
- else
- {
- yaz_log(YLOG_LOG, "%p Connection idle timeout %s", co, client_get_id(cl));
- remove_connection_from_host(co);
- yaz_mutex_leave(host->mutex);
- connection_destroy(co);
- }
+ remove_connection_from_host(co);
+ yaz_mutex_leave(host->mutex);
+ connection_destroy(co);
}
else
{
non_block_events(co);
ZOOM_connection_fire_event_socket(co->link, event);
-
+
non_block_events(co);
client_unlock(cl);
ZOOM_options_set(zoptions, "async", "1");
ZOOM_options_set(zoptions, "implementationName", PACKAGE_NAME);
ZOOM_options_set(zoptions, "implementationVersion", VERSION);
-
+
if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
ZOOM_options_set(zoptions, "charset", charset);
-
+
assert(host->ipport);
if (host->proxy)
{
assert(host->tproxy);
yaz_log(YLOG_LOG, "tproxy=%s", host->ipport);
ZOOM_options_set(zoptions, "tproxy", host->ipport);
- }
+ }
if (apdulog && *apdulog)
ZOOM_options_set(zoptions, "apdulog", apdulog);
ZOOM_options_set(zoptions, "user", auth);
if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
ZOOM_options_set(zoptions, "sru", sru);
- if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
+ if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
&& *sru_version)
ZOOM_options_set(zoptions, "sru_version", sru_version);
if (!(con->link = ZOOM_connection_create(zoptions)))
return -1;
}
- if (sru && *sru)
+ if (sru && *sru && !strstr(host->url, "://"))
{
- char http_hostport[512];
- strcpy(http_hostport, "http://");
- strcat(http_hostport, host->url);
- yaz_log(YLOG_LOG, "SRU connect to : %s", http_hostport);
- ZOOM_connection_connect(con->link, http_hostport, 0);
+ WRBUF w = wrbuf_alloc();
+ wrbuf_puts(w, "http://");
+ wrbuf_puts(w, host->url);
+ ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
+ wrbuf_destroy(w);
}
else
{
{
assert(co->host);
if (co->host == host && client_get_state(cl) == Client_Idle)
- ; /* reusing connection. It's ours! */
- else
{
- client_incref(cl);
- connection_release(co);
- co = 0;
+ return 2;
}
+ client_incref(cl);
+ connection_release(co);
+ co = 0;
}
if (!co)
{
PZ_MAX_CONNECTIONS);
if (v && *v)
max_connections = atoi(v);
-
+
v = session_setting_oneval(client_get_database(cl),
PZ_REUSE_CONNECTIONS);
if (v && *v)