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

[karl at svn.xiph.org]

Author: karl
Date: 2008-05-20 19:19:47 -0700 (Tue, 20 May 2008)
New Revision: 14934

Modified:
   icecast/trunk/icecast/src/source.c
   icecast/trunk/icecast/src/yp.c
Log:
handle a couple of possible odd misconfiguration cases with YP. Make sure the
peak_listeners stat is shown when relays are inactive.


Modified: icecast/trunk/icecast/src/source.c
===================================================================
--- icecast/trunk/icecast/src/source.c	2008-05-20 14:35:21 UTC (rev 14933)
+++ icecast/trunk/icecast/src/source.c	2008-05-21 02:19:47 UTC (rev 14934)
@@ -940,6 +940,8 @@
 
     DEBUG1("Applying mount information for \"%s\"", source->mount);
     avl_tree_rlock (source->client_tree);
+    stats_event_args (source->mount, "listener_peak", "%lu", source->peak_listeners);
+
     if (mountinfo)
     {
         source->max_listeners = mountinfo->max_listeners;

Modified: icecast/trunk/icecast/src/yp.c
===================================================================
--- icecast/trunk/icecast/src/yp.c	2008-05-20 14:35:21 UTC (rev 14933)
+++ icecast/trunk/icecast/src/yp.c	2008-05-21 02:19:47 UTC (rev 14934)
@@ -246,6 +246,8 @@
                 destroy_yp_server (server);
                 break;
             }
+            if (server->url_timeout > 10 || server->url_timeout < 1)
+                server->url_timeout = 6;
             if (server->touch_interval < 30)
                 server->touch_interval = 30;
             curl_easy_setopt (server->curl, CURLOPT_USERAGENT, server->server_id);
@@ -386,6 +388,8 @@
     free (value);
 
     value = stats_get_value (yp->mount, "bitrate");
+    if (value == NULL)
+        value = stats_get_value (yp->mount, "ice-bitrate");
     add_yp_info (yp, value, YP_BITRATE);
     free (value);