[backend] report network errors in getprojpack as "interconnect errors"

openSUSE · Feb 19, 2013 · 687979e · 687979e
1 parent 09d3d52
commit 687979e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver
@@ -2430,7 +2430,14 @@ sub getprojpack {
   if ($cgi->{'noremote'}) {
     *BSRPC::rpc = sub {die("500 remote error: noremote option\n");};
   } else {
-    *BSRPC::rpc = *oldbsrpc;
+    *BSRPC::rpc = sub {
+      my $r = eval { oldbsrpc(@_) };
+      if ($@) {
+	$@ = "interconnect error: $@" unless $@ =~ /(?:remote|interconnect) error:/;
+	die($@);
+      }
+      return $r;
+    };
   }
   $arch ||= 'noarch';
   $projids = [ findprojects() ] unless $projids;