/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) 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
int err;
if ((err = ZOOM_connection_error(link, &error, &addinfo)))
{
- yaz_log(YLOG_LOG, "Error %s from %s",
- error, client_get_id(cl));
+ struct session *se = client_get_session(cl);
+
+ session_log(se, YLOG_WARN, "%s: Error %s (%s)",
+ client_get_id(cl), error, addinfo);
client_set_diagnostic(cl, err, error, addinfo);
client_set_state(cl, Client_Error);
}
case ZOOM_EVENT_RECV_APDU:
break;
case ZOOM_EVENT_CONNECT:
- yaz_log(YLOG_LOG, "Connected to %s", client_get_id(cl));
co->state = Conn_Open;
break;
case ZOOM_EVENT_RECV_SEARCH:
{
int r = ZOOM_connection_exec_task(co->link);
if (!r)
+ {
+ struct client *cl = co->client;
+
+ client_lock(cl);
non_block_events(co);
+ client_unlock(cl);
+ }
else
{
iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
co->client = 0;
}
+void connection_release2(struct connection *co)
+{
+ co->client = 0;
+}
+
void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
{
struct connection *con;
{
if (con->state == Conn_Closed)
{
- if (!host->ipport || !con->client) /* unresolved or no client */
+ struct client *cl = con->client;
+ if (!host->ipport || !cl) /* unresolved or no client */
{
remove_connection_from_host(con);
yaz_mutex_leave(host->mutex);
}
else
{
- struct session_database *sdb = client_get_database(con->client);
- if (sdb)
+ struct session_database *sdb = client_get_database(cl);
+ struct session *se = client_get_session(cl);
+ if (sdb && se)
{
yaz_mutex_leave(host->mutex);
- client_start_search(con->client);
+ client_start_search(cl);
}
else
{
}
else
{
- yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
con = con->next;
}
}
struct session_database *sdb = client_get_database(con->client);
const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
+ const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED);
+ const char *redis = session_setting_oneval(sdb, PZ_REDIS);
assert(con);
if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
ZOOM_options_set(zoptions, "charset", charset);
+ if (memcached && *memcached)
+ ZOOM_options_set(zoptions, "memcached", memcached);
+ if (redis && *redis)
+ ZOOM_options_set(zoptions, "redis", redis);
assert(host->ipport);
if (host->proxy)