Merge lp:~verterok/unity-scope-askubuntu/askubuntu-logging into lp:unity-scope-askubuntu

[Guillermo Gonzalez]

Add basic logging

Add basic logging to help debugging in the server

[David Callé (davidc3)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:12
http://jenkins.qa.ubuntu.com/job/unity-scope-askubuntu-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-askubuntu-saucy-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-askubuntu-saucy-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-askubuntu-saucy-i386-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-askubuntu-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verterok/unity-scope-askubuntu/askubuntu-logging]

13. By Guillermo Gonzalez on 2013-09-20

fix tests to work with latest libunity

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:13
http://jenkins.qa.ubuntu.com/job/unity-scope-askubuntu-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-askubuntu-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-askubuntu-saucy-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-askubuntu-saucy-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-askubuntu-ci/8/rebuild

review: Approve (continuous-integration)

=== modified file 'src/unity_askubuntu_daemon.py'
--- src/unity_askubuntu_daemon.py	2013-09-18 09:53:51 +0000
+++ src/unity_askubuntu_daemon.py	2013-09-20 21:29:53 +0000
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gi.repository import GLib, Gio
+from gi.repository import Gio
 from gi.repository import Unity
 import gettext
 import urllib.request
@@ -23,6 +23,7 @@
 import json
 import gzip
 import io
+import logging
 
 APP_NAME = 'unity-scope-askubuntu'
 LOCAL_PATH = '/usr/share/locale/'
@@ -66,6 +67,7 @@
 SE_API_KEY = "BmtlCGm1UU-Cmn8FAvfT4Q"
 NUMS = '0123456789'
 
+logger = logging.getLogger("unity.scope.askubuntu")
 
 def search(search, filters):
     '''
@@ -75,13 +77,15 @@
     if not search or len(search) < 3:
         return results
     query = urllib.parse.quote(search)
+    logger.debug("Search: %s", query)
     url = "%s/similar?title=%s&pagesize=30" % (QUESTIONS_SERVER, query)
-    print (url)
     try:
+        logger.debug("Requesting: %s", url)
         response = urllib.request.urlopen(url, timeout=0.5).read()
         response = response.decode('utf8')
         result = json.loads(response)
     except Exception:
+        logger.exception("Error while fetching questions.")
         result = "{}"
     if 'questions' in result:
         for question in result['questions']:
@@ -111,14 +115,16 @@
                                 'comment': text,
                                 'tags': ', '.join(question['tags']),
                                 'date': question['creation_date']})
-    for search in search.split():
-        if not all(i in NUMS for i in search):
-            url = '%stags?filter=%s&pagesize=3&key=%s' % (TAGS_SERVER, search, SE_API_KEY)
-            response = urllib.request.urlopen(url).read()
-            unzipped = gzip.GzipFile(fileobj=io.BytesIO(response))
+    for search_term in search.split():
+        if not all(i in NUMS for i in search_term):
+            url = '%stags?filter=%s&pagesize=3&key=%s' % (TAGS_SERVER, search_term, SE_API_KEY)
             try:
+                logger.debug("Requesting tags similar to: %s", search_term)
+                response = urllib.request.urlopen(url).read()
+                unzipped = gzip.GzipFile(fileobj=io.BytesIO(response))
                 data = json.load(io.TextIOWrapper(unzipped, encoding='utf-8'))
             except:
+                logger.exception("Error while fetching tags (%s)", search_term)
                 data = "{}"
             if "tags" in data:
                 for i in data['tags']:

=== modified file 'tests/test_askubuntu.py'
--- tests/test_askubuntu.py	2013-02-13 15:22:14 +0000
+++ tests/test_askubuntu.py	2013-09-20 21:29:53 +0000
@@ -29,7 +29,7 @@
     def perform_query(self, query, filter_set = Unity.FilterSet.new()):
         result_set = ResultSet()
         ctx = Unity.SearchContext.create(query, 0, filter_set,
-                                         None, result_set, None)
+                                         {}, result_set, None)
         s = self.scope.create_search_for_query(ctx)
         s.run()
         return result_set
@@ -47,7 +47,7 @@
         self.scope_module.QUESTIONS_SERVER = 'file:tests/data/mock_askubuntu_questions_pass#'
         self.scope_module.TAGS_SERVER = 'file:tests/data/mock_askubuntu_tags_pass.gz#'
         expected_results = ["",
-                            "Gtalk and empathy", 
+                            "Gtalk and empathy",
                             "How to install Empathy 3.x in ubuntu 11.04",
                             "http://www.askubuntu.com/questions/40459"]
         results = []