if ((err = ZOOM_connection_error(link, &error, &addinfo)))
{
yaz_log(YLOG_LOG, "Error %s from %s",
- error, client_get_url(cl));
+ error, client_get_id(cl));
client_set_diagnostic(cl, err);
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_url(cl));
+ yaz_log(YLOG_LOG, "Connected to %s", client_get_id(cl));
co->state = Conn_Open;
break;
case ZOOM_EVENT_RECV_SEARCH:
break;
default:
yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
- ev, client_get_url(cl));
+ ev, client_get_id(cl));
}
}
if (got_records)
{
if (co->state == Conn_Connecting)
{
- yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_url(cl));
+ yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_id(cl));
client_set_state(cl, Client_Error);
remove_connection_from_host(co);
}
else
{
- yaz_log(YLOG_LOG, "%p Connection idle timeout %s", co, client_get_url(cl));
+ 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);
zproxy = 0;
if (!url || !*url)
- url = sdb->database->url;
+ url = sdb->database->id;
host = find_host(client_get_session(cl)->service->server->database_hosts,
url);
yaz_log(YLOG_DEBUG, "client_prep_connection: target=%s url=%s",
- client_get_url(cl), url);
+ client_get_id(cl), url);
co = client_get_connection(cl);
num_connections, max_connections);
if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
{
- yaz_log(YLOG_LOG, "out of connections %s", client_get_url(cl));
+ yaz_log(YLOG_LOG, "out of connections %s", client_get_id(cl));
client_set_state(cl, Client_Error);
yaz_mutex_leave(host->mutex);
return 0;