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
Avoid warning about non-handled switch stmt case
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
630db75
..
98a73e0
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-144,6
+144,7
@@
static struct connection *connection_create(struct client *cl,
iochan_man_t iochan_man)
{
struct connection *co;
iochan_man_t iochan_man)
{
struct connection *co;
+ int ret;
co = xmalloc(sizeof(*co));
co = xmalloc(sizeof(*co));
@@
-159,9
+160,13
@@
static struct connection *connection_create(struct client *cl,
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
- connection_connect(co, iochan_man);
-
+ ret = connection_connect(co, iochan_man);
connection_use(1);
connection_use(1);
+ if (ret)
+ { /* error */
+ connection_destroy(co);
+ co = 0;
+ }
return co;
}
return co;
}
@@
-194,8
+199,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);
}
@@
-219,7
+226,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:
@@
-240,10
+246,7
@@
static void non_block_events(struct connection *co)
{
struct client *cl = co->client;
if (cl)
{
struct client *cl = co->client;
if (cl)
- {
- client_check_preferred_watch(cl);
client_got_records(cl);
client_got_records(cl);
- }
}
}
}
}
@@
-317,6
+320,11
@@
static void connection_handler(IOCHAN iochan, int event)
}
}
}
}
+void connection_release2(struct connection *co)
+{
+ co->client = 0;
+}
+
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
{
ZOOM_options zoptions = ZOOM_options_create();
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
{
ZOOM_options zoptions = ZOOM_options_create();
@@
-330,6
+338,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);
@@
-341,6
+350,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);
if (con->zproxy)
{
if (con->zproxy)
{
@@
-441,6
+452,8
@@
int client_prep_connection(struct client *cl,
client_get_id(cl), url);
co = client_get_connection(cl);
client_get_id(cl), url);
co = client_get_connection(cl);
+ if (co)
+ return 2;
if (!co)
{
co = connection_create(cl, url, zproxy,
if (!co)
{
co = connection_create(cl, url, zproxy,