Use hostport, not ipport for proxied connections

[pazpar2-moved-to-github.git] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index a936090..c55785d 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -194,23 +194,27 @@ static void non_block_events(struct connection *co)
             continue;
         ev = ZOOM_connection_last_event(link);
         
-#if 0
-        yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev));
+#if 1
+        yaz_log(YLOG_DEBUG, "%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;
@@ -247,6 +251,7 @@ static void non_block_events(struct connection *co)
         struct client *cl = co->client;
         if (cl)
         {
+            client_check_preferred_watch(cl);
             client_got_records(cl);
         }
     }
@@ -287,15 +292,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
@@ -431,11 +432,13 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
         strcat(http_hostport, host->hostport);
         ZOOM_connection_connect(link, http_hostport, 0);
     }
+    else if (zproxy && *zproxy)
+        ZOOM_connection_connect(link, host->hostport, 0);        
     else
         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);
@@ -471,11 +474,17 @@ int client_prep_connection(struct client *cl,
     if (!co)
     {
         int max_connections = 0;
+        int reuse_connections = 1;
         const char *v = session_setting_oneval(client_get_database(cl),
                                                PZ_MAX_CONNECTIONS);
         if (v && *v)
             max_connections = atoi(v);
-        
+
+        v = session_setting_oneval(client_get_database(cl),
+                PZ_REUSE_CONNECTIONS);
+        if (v && *v)
+            reuse_connections = atoi(v);
+
         // See if someone else has an idle connection
         // We should look at timestamps here to select the longest-idle connection
         yaz_mutex_enter(host->mutex);
@@ -484,42 +493,41 @@ int client_prep_connection(struct client *cl,
             int num_connections = 0;
             for (co = host->connections; co; co = co->next)
                 num_connections++;
-            for (co = host->connections; co; co = co->next)
-            {
-                if (connection_is_idle(co) &&
-                    (!co->client || client_get_state(co->client) == Client_Idle) &&
-                    !strcmp(ZOOM_connection_option_get(co->link, "user"),
-                            session_setting_oneval(client_get_database(cl),
-                                                   PZ_AUTHENTICATION)))
+            if (reuse_connections) {
+                for (co = host->connections; co; co = co->next)
                 {
-                    if (zproxy == 0 && co->zproxy == 0)
-                        break;
-                    if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy))
-                        break;
+                    if (connection_is_idle(co) &&
+                        (!co->client || client_get_state(co->client) == Client_Idle) &&
+                        !strcmp(ZOOM_connection_option_get(co->link, "user"),
+                                session_setting_oneval(client_get_database(cl),
+                                                       PZ_AUTHENTICATION)))
+                    {
+                        if (zproxy == 0 && co->zproxy == 0)
+                            break;
+                        if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy))
+                            break;
+                    }
                 }
-            }
-            if (co)
-            {
-                yaz_log(YLOG_LOG, "num_connections = %d (reusing)",
-                        num_connections);
-                break;
-            }
-            if (max_connections > 0) {
-                if (num_connections < max_connections)
+                if (co)
                 {
-                    yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
-                            num_connections, max_connections);
+                    yaz_log(YLOG_LOG, "num_connections = %d (reusing)", num_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);
-                if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
-                {
-                    yaz_log(YLOG_LOG, "out of connections %s", client_get_url(cl));
-                    client_set_state(cl, Client_Error);
-                    yaz_mutex_leave(host->mutex);
-                    return 0;
-                }
+                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));
+                client_set_state(cl, Client_Error);
+                yaz_mutex_leave(host->mutex);
+                return 0;
             }
         }
         if (co)