Add a timeout when fetching the XML status page from the backend.

diff --git a/ChangeLog b/ChangeLog
index d72bfd2c890a59ff1f3a8c1f92eeadb1f832a5aa..cc0e7456baa6edf35cbee3f235eb52bb67ba1139 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-05-23     Andrew Ruthven
+       Add a timeout for the HTTP request to the backend.
+
 2008-04-19     Andrew Ruthven
        Add a molly-guard check
 

diff --git a/bin/mythtv-status b/bin/mythtv-status
index 35587ef6ec63a52751c44846c4fa0de74331a6b7..1ef59dfb466cc7ea1d8917501ab3ab60e40300cf 100755 (executable)
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -531,7 +531,15 @@ sub load_xml {
     close IN;
   } else {
     my $url = "http://$host:$port/xml";
-    $status = get($url);
+    eval {
+      local $SIG{ALRM} = sub { die "alarm\n" };
+      alarm(15);
+      $status = get($url);
+      alarm(0);
+    };
+
+    die "Sorry, failed to fetch $url: Connection to MythTV timed out.\n"
+      if $@;
 
     die "Sorry, failed to fetch $url.\n"
       unless defined $status;

diff --git a/debian/changelog b/debian/changelog
index 76f3e6756cde579f84b253c5fb7907ef5db6e9ef..748e9e642d4e2f5589b1ee7ed36709ec195ed359 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mythtv-status (0.7.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrew Ruthven <andrew@etc.gen.nz>  Fri, 23 May 2008 09:31:39 +1200
+
 mythtv-status (0.7.3-2) unstable; urgency=low
 
   * The cron.daily file should honour the HOST setting in