X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=37ad03f9bb24ad2806d0a5521c68974c56654a04;hb=933909a6cfd5dcacc446f45e7217849b917abefd;hp=376a079dfd5a56358b757e692835935cdcebaab5;hpb=86433d4fcd24b068f362aecf0b1d1666d32ac6a1;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 376a079..37ad03f 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-socket-manager.cpp,v $
- * Revision 1.12  2000-10-24 12:29:57  adam
+ * Revision 1.13  2000-11-20 11:27:33  adam
+ * Fixes for connect operation (timeout and notify fix).
+ *
+ * Revision 1.12  2000/10/24 12:29:57  adam
  * Fixed bug in proxy where a Yaz_ProxyClient could be owned by
  * two Yaz_Proxy's (fatal).
  *
@@ -174,6 +177,8 @@ int Yaz_SocketManager::processEvent()
 	    timeout_this = p->timeout;
 	    if (p->last_activity)
 		timeout_this -= now - p->last_activity;
+	    else
+		p->last_activity = now;
 	    if (timeout_this < 1)
 		timeout_this = 1;
 	    if (!timeout || timeout_this < timeout)
@@ -222,7 +227,7 @@ int Yaz_SocketManager::processEvent()
 		 now >= p->last_activity + (int) (p->timeout))
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
-	    logf (LOG_LOG, "timeout now = %ld last_activity=%ld timeout=%d",
+	    logf (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
 		  now, p->last_activity, p->timeout);
 	    p->last_activity = now;
 	    event->observer = p->observer;