Merge lp:~george-edison55/askubuntu-lens/added-au-data-server into lp:~markjtully/askubuntu-lens/oneiric

[Nathan Osman]

I have added another server to the list of services that provide a cached set of data from the Ask Ubuntu API. I have used random.random() to select a server at random to send the request to.

[Stefano Palazzo (stefano-palazzo)]

Fantastic. Did you test if both respond quickly?

[Nathan Osman (george-edison55)]

Unfortunately, I'm using my Windows machine ATM - so I can't test the lens directly. However, direct queries on the server are working fine.

[Mark Tully (markjtully)]

Well, it's been merged now. And it works. So, Approve!

review: Approve

=== modified file 'askubuntu_bridge.py'
--- askubuntu_bridge.py	2011-09-16 01:02:38 +0000
+++ askubuntu_bridge.py	2011-10-18 02:25:25 +0000
@@ -24,7 +24,7 @@
 import json
 import functools
 import time
-
+import random
 
 DEFAULT_SITE = "askubuntu.com"
 SE_API_KEY = "BmtlCGm1UU-Cmn8FAvfT4Q"
@@ -103,10 +103,16 @@
     print "api.%s/\33[1;31m%s\33[m" % (site, query)
     if query.startswith("similar?title") and site == "askubuntu.com":
         try:
-            result = json.loads(urllib2.urlopen(
-                "http://50.19.108.78:8080/%s" % query.replace(" ", "%20"),
-                timeout=0.5).read())
-            print "\33[1mused ec2 service\33[m"
+            if random.random() > 0.5:
+                result = json.loads(urllib2.urlopen(
+                    "http://50.19.108.78:8080/%s" % query.replace(" ", "%20"),
+                    timeout=0.5).read())
+                print "\33[1mused ec2 service\33[m"
+            else:
+                result = json.loads(urllib2.urlopen(
+                    "http://audata.quickmediasolutions.com:8046/%s" % query.replace(" ", "%20"),
+                    timeout=0.5).read())
+                print "\33[1mused AU Data Server service\33[m"
             return result
         except Exception as e:
             print "\33[1;31m%s\33[m" % repr(e)