From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 11 Dec 2012 11:51:11 +0000 (+0100)
Subject: Produce diagnostic when database times out
X-Git-Tag: v1.6.24~15
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=5a6816065057859b44273d5c674371c56311a667;p=pazpar2-moved-to-github.git

Produce diagnostic when database times out

Some targets may be quite slow during search or record retrieval.
This commit ensure that "timeout" ZOOM diagnostic 10007 is produced
for those.
---

diff --git a/src/connection.c b/src/connection.c
index f48d735..d3eaeef 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -216,6 +216,8 @@ static void non_block_events(struct connection *co)
 #endif
         switch (ev)
         {
+        case ZOOM_EVENT_TIMEOUT:
+            break;
         case ZOOM_EVENT_END:
             {
                 const char *error, *addinfo;
@@ -320,22 +322,14 @@ static void connection_handler(IOCHAN iochan, int event)
     }
     else if (event & EVENT_TIMEOUT)
     {
-        if (co->state == Conn_Connecting)
-        {
-            yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_id(cl));
+        ZOOM_connection_fire_event_timeout(co->link);
+        client_lock(cl);
+        non_block_events(co);
+        client_unlock(cl);
 
-            client_set_state(cl, Client_Error);
-            remove_connection_from_host(co);
-            yaz_mutex_leave(host->mutex);
-            connection_destroy(co);
-        }
-        else
-        {
-            yaz_log(YLOG_LOG,  "%p Connection idle timeout %s", co, client_get_id(cl));
-            remove_connection_from_host(co);
-            yaz_mutex_leave(host->mutex);
-            connection_destroy(co);
-        }
+        remove_connection_from_host(co);
+        yaz_mutex_leave(host->mutex);
+        connection_destroy(co);
     }
     else
     {