X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=19d047781cf52276e816acc6ec3a2c1a540e764d;hb=e5f5c04e9c9e3c9001e53981fdbad03e1c3842d2;hp=bfa764efe5b381cb5f3f7b346c077ccd5eb4cabd;hpb=46eea7c36057b34c235be40c5d4df9256a7668fd;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index bfa764e..19d0477 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -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
@@ -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;
-    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);
@@ -504,16 +504,14 @@ int client_prep_connection(struct client *cl,
                         num_connections);
                 break;
             }
-            if (max_connections > 0) {
-                if (num_connections < max_connections)
-                {
-                    yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
-                            num_connections, max_connections);
-                    break;
-                }
-                yaz_log(YLOG_LOG, "num_connections = %d (waiting) max = %d",
+            if (max_connections <= 0 || num_connections < max_connections)
+            {
+                yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
                         num_connections, max_connections);
+                break;
             }
+            yaz_log(YLOG_LOG, "num_connections = %d (waiting) max = %d",
+                    num_connections, max_connections);
             if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
             {
                 yaz_log(YLOG_LOG, "out of connections %s", client_get_url(cl));