Set client state to Client_Error on ZOOM errors
[pazpar2-moved-to-github.git] / src / connection.c
index c2c5677..1406811 100644 (file)
@@ -195,22 +195,26 @@ 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));
+                    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;
@@ -287,15 +291,11 @@ static void connection_handler(IOCHAN iochan, int event)
             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);
         }
-        else
-        {
-            yaz_log(YLOG_LOG,  "ignore timeout %s", client_get_url(cl));
-        }
         yaz_mutex_leave(host->mutex);
     }
     else