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
Dump configuration file during start PAZ-957
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
5f127ea
..
3afc75f
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-228,8
+228,10
@@
static void non_block_events(struct connection *co)
int err;
if ((err = ZOOM_connection_error(link, &error, &addinfo)))
{
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);
}
client_set_diagnostic(cl, err, error, addinfo);
client_set_state(cl, Client_Error);
}
@@
-254,7
+256,6
@@
static void non_block_events(struct connection *co)
case ZOOM_EVENT_RECV_APDU:
break;
case ZOOM_EVENT_CONNECT:
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:
co->state = Conn_Open;
break;
case ZOOM_EVENT_RECV_SEARCH:
@@
-284,7
+285,13
@@
void connection_continue(struct connection *co)
{
int r = ZOOM_connection_exec_task(co->link);
if (!r)
{
int r = ZOOM_connection_exec_task(co->link);
if (!r)
+ {
+ struct client *cl = co->client;
+
+ client_lock(cl);
non_block_events(co);
non_block_events(co);
+ client_unlock(cl);
+ }
else
{
iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
else
{
iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
@@
-415,6
+422,7
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
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);
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);
assert(con);
@@
-426,6
+434,8
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
ZOOM_options_set(zoptions, "charset", charset);
if (memcached && *memcached)
ZOOM_options_set(zoptions, "memcached", memcached);
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)
assert(host->ipport);
if (host->proxy)