[mb-commits] r10403 - in mb_server/branches/TemplateToolkit/lib: . MusicBrainz/Server/Controller

[root at musicbrainz.org]

Author: acid2
Date: 2008-09-30 15:13:58 +0000 (Tue, 30 Sep 2008)
New Revision: 10403

Modified:
   mb_server/branches/TemplateToolkit/lib/DBDefs.pm.default
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Search.pm
Log:
Support for a proxy server in the search engine

Modified: mb_server/branches/TemplateToolkit/lib/DBDefs.pm.default
===================================================================
--- mb_server/branches/TemplateToolkit/lib/DBDefs.pm.default	2008-09-30 15:13:33 UTC (rev 10402)
+++ mb_server/branches/TemplateToolkit/lib/DBDefs.pm.default	2008-09-30 15:13:58 UTC (rev 10403)
@@ -169,6 +169,14 @@
 sub RATELIMIT_SERVER { undef }
 
 ################################################################################
+# Proxy settings
+################################################################################
+
+sub PROXY_ENABLE { 0 }
+sub PROXY_HOST { '' }
+sub PROXY_PORT { 8000 }
+
+################################################################################
 # Other Settings
 ################################################################################
 

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Search.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Search.pm	2008-09-30 15:13:33 UTC (rev 10402)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Search.pm	2008-09-30 15:13:58 UTC (rev 10403)
@@ -149,6 +149,11 @@
         my $ua = LWP::UserAgent->new;
         $ua->timeout (2);
         
+        if (DBDefs::PROXY_ENABLE)
+        {
+            $ua->proxy([ 'http' ], sprintf('http://%s:%i', DBDefs::PROXY_HOST, DBDefs::PROXY_PORT));
+        }
+
         # Dispatch the search request.
         my $response = $ua->get($search_url);
         unless ($response->is_success)