iochan_man_t iochan_man)
{
struct connection *co;
+ int ret;
co = xmalloc(sizeof(*co));
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
- connection_connect(co, iochan_man);
-
+ ret = connection_connect(co, iochan_man);
connection_use(1);
+ if (ret)
+ { /* error */
+ connection_destroy(co);
+ co = 0;
+ }
return co;
}
{
struct client *cl = co->client;
if (cl)
- {
- client_check_preferred_watch(cl);
client_got_records(cl);
- }
}
}
}
}
+void connection_release2(struct connection *co)
+{
+ co->client = 0;
+}
+
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
{
ZOOM_options zoptions = ZOOM_options_create();
const char *sru;
const char *sru_version = 0;
const char *value;
+ int r = 0;
WRBUF w;
- struct session_database *sdb = client_get_database(con->client);
+ struct client *cl = con->client;
+ struct session_database *sdb = client_get_database(cl);
const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
+ struct session *se = client_get_session(cl);
const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED);
const char *redis = session_setting_oneval(sdb, PZ_REDIS);
if (!(con->link = ZOOM_connection_create(zoptions)))
{
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
+ session_log(se, YLOG_WARN, "%s: ZOOM_connection_create failed",
+ client_get_id(cl));
ZOOM_options_destroy(zoptions);
return -1;
}
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
- iochan_add(iochan_man, con->iochan);
-
- client_set_state(con->client, Client_Connecting);
+ if (iochan_add(iochan_man, con->iochan, 20))
+ {
+ session_log(se, YLOG_WARN, "%s: out of connections", client_get_id(cl));
+ iochan_destroy(con->iochan);
+ con->iochan = 0;
+ ZOOM_connection_destroy(con->link);
+ con->link = 0;
+ r = -1;
+ }
+ else
+ {
+ client_set_state(cl, Client_Connecting);
+ }
ZOOM_options_destroy(zoptions);
wrbuf_destroy(w);
- return 0;
+ return r;
}
// Ensure that client has a connection associated
client_get_id(cl), url);
co = client_get_connection(cl);
+ if (co)
+ return 2;
if (!co)
{
co = connection_create(cl, url, zproxy,