From: Adam Dickmeiss Date: Wed, 19 May 2010 13:22:12 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.4.1~14 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=474362580ddc171ea60e8c6e12852456f880f1fb;hp=5775b27098fab0dac8ddcbc719a8b35c67391424;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- diff --git a/src/connection.c b/src/connection.c index c2c5677..79eb40e 100644 --- a/src/connection.c +++ b/src/connection.c @@ -195,21 +195,21 @@ static void non_block_events(struct connection *co) ev = ZOOM_connection_last_event(link); #if 0 - yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev)); + yaz_log(YLOG_LOG, "%p Connection ZOOM_EVENT_%s", co, ZOOM_get_event_str(ev)); #endif switch (ev) { case ZOOM_EVENT_END: { const char *error, *addinfo; - int err; + int err; if ((err = ZOOM_connection_error(link, &error, &addinfo))) { yaz_log(YLOG_LOG, "Error %s from %s", error, client_get_url(cl)); } iochan_settimeout(iochan, co->session_timeout); - client_set_diagnostic(cl, err); + client_set_diagnostic(cl, err); client_set_state(cl, Client_Idle); yaz_cond_broadcast(co->host->cond_ready); }