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
Looks in more places for system-control-nr
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
79eb40e
..
19d0477
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-207,10
+207,14
@@
static void non_block_events(struct connection *co)
{
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_url(cl));
{
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_url(cl));
+ client_set_diagnostic(cl, err);
+ client_set_state(cl, Client_Error);
+ }
+ else
+ {
+ iochan_settimeout(iochan, co->session_timeout);
+ client_set_state(cl, Client_Idle);
}
}
- iochan_settimeout(iochan, co->session_timeout);
- client_set_diagnostic(cl, err);
- client_set_state(cl, Client_Idle);
yaz_cond_broadcast(co->host->cond_ready);
}
break;
yaz_cond_broadcast(co->host->cond_ready);
}
break;
@@
-287,15
+291,11
@@
static void connection_handler(IOCHAN iochan, int event)
client_set_state(cl, Client_Error);
connection_destroy(co);
}
client_set_state(cl, Client_Error);
connection_destroy(co);
}
- else if (client_get_state(co->client) == Client_Idle)
+ else
{
yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl));
connection_destroy(co);
}
{
yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl));
connection_destroy(co);
}
- else
- {
- yaz_log(YLOG_LOG, "ignore timeout %s", client_get_url(cl));
- }
yaz_mutex_leave(host->mutex);
}
else
yaz_mutex_leave(host->mutex);
}
else
@@
-435,7
+435,7
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
ZOOM_connection_connect(link, host->ipport, 0);
con->link = link;
ZOOM_connection_connect(link, host->ipport, 0);
con->link = link;
- con->iochan = iochan_create(0, connection_handler, 0, "connection_socket");
+ con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket");
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);