projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test config file
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
44c1fb9
..
3ef5cf6
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2010 Index Data
+ Copyright (C) 2006-2011 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
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
@@
-78,7
+78,8
@@
struct connection {
enum {
Conn_Resolving,
Conn_Connecting,
enum {
Conn_Resolving,
Conn_Connecting,
- Conn_Open
+ Conn_Open,
+ Conn_Dead
} state;
int operation_timeout;
int session_timeout;
} state;
int operation_timeout;
int session_timeout;
@@
-133,7
+134,7
@@
static void connection_destroy(struct connection *co)
ZOOM_connection_destroy(co->link);
iochan_destroy(co->iochan);
}
ZOOM_connection_destroy(co->link);
iochan_destroy(co->iochan);
}
- yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
+ yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->host->hostport);
if (co->client)
{
if (co->client)
{
@@
-287,17
+288,20
@@
static void connection_handler(IOCHAN iochan, int event)
{
if (co->state == Conn_Connecting)
{
{
if (co->state == Conn_Connecting)
{
- yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl));
+ yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_url(cl));
client_set_state(cl, Client_Error);
client_set_state(cl, Client_Error);
+ remove_connection_from_host(co);
+ yaz_mutex_leave(host->mutex);
connection_destroy(co);
}
else
{
connection_destroy(co);
}
else
{
- yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl));
+ yaz_log(YLOG_LOG, "%p Connection idle timeout %s", co, client_get_url(cl));
+ remove_connection_from_host(co);
+ yaz_mutex_leave(host->mutex);
connection_destroy(co);
}
connection_destroy(co);
}
- yaz_mutex_leave(host->mutex);
}
else
{
}
else
{
@@
-389,6
+393,7
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
const char *charset;
const char *sru;
const char *sru_version = 0;
const char *charset;
const char *sru;
const char *sru_version = 0;
+ const char *extra_args = 0;
struct session_database *sdb = client_get_database(con->client);
const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
struct session_database *sdb = client_get_database(con->client);
const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
@@
-419,6
+424,8
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
&& *sru_version)
ZOOM_options_set(zoptions, "sru_version", sru_version);
if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
&& *sru_version)
ZOOM_options_set(zoptions, "sru_version", sru_version);
+ if ((extra_args = session_setting_oneval(sdb, PZ_EXTRA_ARGS)) && *extra_args)
+ ZOOM_options_set(zoptions, "extraArgs", extra_args);
if (!(link = ZOOM_connection_create(zoptions)))
{
if (!(link = ZOOM_connection_create(zoptions)))
{
@@
-534,6
+541,7
@@
int client_prep_connection(struct client *cl,
}
if (co)
{
}
if (co)
{
+ yaz_log(YLOG_LOG, "%p Connection reuse. state: %d", co, co->state);
connection_release(co);
client_set_connection(cl, co);
co->client = cl;
connection_release(co);
client_set_connection(cl, co);
co->client = cl;