Commit 3116f62a authored by Karl Heyes's avatar Karl Heyes

extra checks on YP updating, typically on changes over HUP

svn path=/icecast/trunk/icecast/; revision=9862
parent 1d5c1ebd
...@@ -601,7 +601,7 @@ static void check_servers () ...@@ -601,7 +601,7 @@ static void check_servers ()
ypdata_t *yp; ypdata_t *yp;
source_t *source = node->key; source_t *source = node->key;
if ((yp = create_yp_entry (source->mount)) != NULL) if (source->yp_public && (yp = create_yp_entry (source->mount)) != NULL)
{ {
DEBUG1 ("Adding existing mount %s", source->mount); DEBUG1 ("Adding existing mount %s", source->mount);
yp->server = server; yp->server = server;
...@@ -830,17 +830,26 @@ void yp_add (const char *mount) ...@@ -830,17 +830,26 @@ void yp_add (const char *mount)
while (server) while (server)
{ {
ypdata_t *yp; ypdata_t *yp;
/* add new ypdata to each servers pending yp */
if ((yp = create_yp_entry (mount)) != NULL) /* on-demand relays may already have a YP entry */
yp = find_yp_mount (server->mounts, mount);
if (yp == NULL)
{ {
DEBUG2 ("Adding %s to %s", mount, server->url); /* add new ypdata to each servers pending yp */
yp->server = server; yp = create_yp_entry (mount);
yp->touch_interval = server->touch_interval; if (yp)
yp->next = server->pending_mounts; {
yp->next_update = time(NULL) + 5; DEBUG2 ("Adding %s to %s", mount, server->url);
server->pending_mounts = yp; yp->server = server;
yp_update = 1; yp->touch_interval = server->touch_interval;
yp->next = server->pending_mounts;
yp->next_update = time(NULL) + 5;
server->pending_mounts = yp;
yp_update = 1;
}
} }
else
DEBUG1 ("YP entry %s already exists", mount);
server = server->next; server = server->next;
} }
thread_mutex_unlock (&yp_pending_lock); thread_mutex_unlock (&yp_pending_lock);
......
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