Commit f7e64956 authored by Karl Heyes's avatar Karl Heyes

fix busy retry bug on failure from previous patch

svn path=/icecast/trunk/icecast/; revision=14824
parent cbb7643b
...@@ -303,7 +303,7 @@ static int send_to_yp (const char *cmd, ypdata_t *yp, char *post) ...@@ -303,7 +303,7 @@ static int send_to_yp (const char *cmd, ypdata_t *yp, char *post)
if (curlcode) if (curlcode)
{ {
yp->process = do_yp_add; 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); ERROR2 ("connection to %s failed with \"%s\"", server->url, server->curl_error);
return -2; return -2;
} }
...@@ -314,7 +314,7 @@ static int send_to_yp (const char *cmd, ypdata_t *yp, char *post) ...@@ -314,7 +314,7 @@ static int send_to_yp (const char *cmd, ypdata_t *yp, char *post)
if (yp->process == do_yp_add) if (yp->process == do_yp_add)
{ {
ERROR3 ("YP %s on %s failed: %s", cmd, server->url, yp->error_msg); 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) if (yp->process == do_yp_touch)
{ {
...@@ -325,9 +325,9 @@ static int send_to_yp (const char *cmd, ypdata_t *yp, char *post) ...@@ -325,9 +325,9 @@ static int send_to_yp (const char *cmd, ypdata_t *yp, char *post)
* cases as a firewall block or incorrect listenurl. * cases as a firewall block or incorrect listenurl.
*/ */
if (yp->touch_interval < 1200) if (yp->touch_interval < 1200)
yp->next_update += 1200; yp->next_update = now + 1200;
else 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); INFO3 ("YP %s on %s failed: %s", cmd, server->url, yp->error_msg);
} }
yp->process = do_yp_add; yp->process = do_yp_add;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment