[xiph-commits] r14824 - icecast/trunk/icecast/src

[karl at svn.xiph.org]

Author: karl
Date: 2008-05-02 09:10:22 -0700 (Fri, 02 May 2008)
New Revision: 14824

Modified:
   icecast/trunk/icecast/src/yp.c
Log:
fix busy retry bug on failure from previous patch


Modified: icecast/trunk/icecast/src/yp.c
===================================================================
--- icecast/trunk/icecast/src/yp.c	2008-05-01 23:28:37 UTC (rev 14823)
+++ icecast/trunk/icecast/src/yp.c	2008-05-02 16:10:22 UTC (rev 14824)
@@ -303,7 +303,7 @@
     if (curlcode)
     {
         yp->process = do_yp_add;
-        yp->next_update += 1200;
+        yp->next_update = now + 1200;
         ERROR2 ("connection to %s failed with \"%s\"", server->url, server->curl_error);
         return -2;
     }
@@ -314,7 +314,7 @@
         if (yp->process == do_yp_add)
         {
             ERROR3 ("YP %s on %s failed: %s", cmd, server->url, yp->error_msg);
-            yp->next_update += 7200;
+            yp->next_update = now + 7200;
         }
         if (yp->process == do_yp_touch)
         {
@@ -325,9 +325,9 @@
              * cases as a firewall block or incorrect listenurl.
              */
             if (yp->touch_interval < 1200)
-                yp->next_update += 1200;
+                yp->next_update = now + 1200;
             else
-                yp->next_update += yp->touch_interval;
+                yp->next_update = now + yp->touch_interval;
             INFO3 ("YP %s on %s failed: %s", cmd, server->url, yp->error_msg);
         }
         yp->process = do_yp_add;