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
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
4be296f
..
e441514
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-2011 Index Data
+ Copyright (C) 2006-2012 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
@@
-224,7
+224,7
@@
static void non_block_events(struct connection *co)
{
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_id(cl));
{
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_id(cl));
- client_set_diagnostic(cl, err);
+ client_set_diagnostic(cl, err, addinfo);
client_set_state(cl, Client_Error);
}
else
client_set_state(cl, Client_Error);
}
else
@@
-288,7
+288,7
@@
void connection_continue(struct connection *co)
{
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_id(co->client));
{
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_id(co->client));
- client_set_diagnostic(co->client, err);
+ client_set_diagnostic(co->client, err, addinfo);
client_set_state_nb(co->client, Client_Error);
}
}
client_set_state_nb(co->client, Client_Error);
}
}
@@
-525,14
+525,13
@@
int client_prep_connection(struct client *cl,
if (co)
{
assert(co->host);
if (co)
{
assert(co->host);
- if (co->host == host)
- ; /* reusing connection. It's ours! */
- else
+ if (co->host == host && client_get_state(cl) == Client_Idle)
{
{
- client_incref(cl);
- connection_release(co);
- co = 0;
+ return 2;
}
}
+ client_incref(cl);
+ connection_release(co);
+ co = 0;
}
if (!co)
{
}
if (!co)
{
@@
-574,21
+573,21
@@
int client_prep_connection(struct client *cl,
}
if (co)
{
}
if (co)
{
- yaz_log(YLOG_LOG, "Host %s: num_connections = %d (reusing)", host->hostport, num_connections);
+ yaz_log(YLOG_LOG, "num_connections = %d (reusing)", num_connections);
break;
}
}
if (max_connections <= 0 || num_connections < max_connections)
{
break;
}
}
if (max_connections <= 0 || num_connections < max_connections)
{
- yaz_log(YLOG_LOG, "Host %s: num_connections = %d (new); max = %d",
- host->hostport, num_connections, max_connections);
+ yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
+ num_connections, max_connections);
break;
}
break;
}
- yaz_log(YLOG_LOG, "Host %s: num_connections = %d (waiting) max = %d",
- host->hostport, num_connections, max_connections);
+ yaz_log(YLOG_LOG, "num_connections = %d (waiting) max = %d",
+ num_connections, max_connections);
if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
{
if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
{
- yaz_log(YLOG_LOG, "Host %s: out of connections %s", host->hostport, client_get_id(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;
client_set_state(cl, Client_Error);
yaz_mutex_leave(host->mutex);
return 0;
@@
-596,7
+595,7
@@
int client_prep_connection(struct client *cl,
}
if (co)
{
}
if (co)
{
- yaz_log(YLOG_LOG, "Host %s: %p Connection reuse. state: %d", host->hostport, co, co->state);
+ 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;
@@
-613,9
+612,8
@@
int client_prep_connection(struct client *cl,
else
{
yaz_mutex_leave(host->mutex);
else
{
yaz_mutex_leave(host->mutex);
- co = connection_create(cl, host, operation_timeout, session_timeout, iochan_man);
- yaz_log(YLOG_LOG, "Host %s: %p Connection new", host->hostport, co);
-
+ co = connection_create(cl, host, operation_timeout, session_timeout,
+ iochan_man);
}
assert(co->host);
}
}
assert(co->host);
}