From 5e310df926698daacfaba043b79a2ebb3a1c6852 Mon Sep 17 00:00:00 2001
From: jar3b <hellotan@live.ru>
Date: Mon, 14 Mar 2016 13:21:45 +0300
Subject: [PATCH] Added error logging on HTTP requests (if config.basic.logging
 is enabled)

---
 aore/search/fiasfactory.py | 10 +++++++++-
 aore/search/search.py      |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/aore/search/fiasfactory.py b/aore/search/fiasfactory.py
index a5445fc..0f63c89 100644
--- a/aore/search/fiasfactory.py
+++ b/aore/search/fiasfactory.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
+import logging
 import re
 import urllib
 from uuid import UUID
 
 import psycopg2
+import traceback
 from bottle import template
 
-from aore.config import db_conf
+from aore.config import db_conf, basic
 from aore.dbutils.dbimpl import DBImpl
 from search import SphinxSearch
 
@@ -54,6 +56,8 @@ class FiasFactory:
 
             results = self.searcher.find(text, strong)
         except Exception, err:
+            if basic.logging:
+                logging.error(traceback.format_exc(err))
             return dict(error=err.args[0])
 
         return results
@@ -66,6 +70,8 @@ class FiasFactory:
             sql_query = self.normalize_templ.replace("//aoid", aoid_guid)
             rows = self.db.get_rows(sql_query, True)
         except Exception, err:
+            if basic.logging:
+                logging.error(traceback.format_exc(err))
             return dict(error=err.args[0])
 
         if len(rows) == 0:
@@ -85,6 +91,8 @@ class FiasFactory:
             sql_query = self.expand_templ.replace("//aoid", normalized_id)
             rows = self.db.get_rows(sql_query, True)
         except Exception, err:
+            if basic.logging:
+                logging.error(traceback.format_exc(err))
             return dict(error=err.args[0])
 
         return rows
diff --git a/aore/search/search.py b/aore/search/search.py
index 0bc8aa6..fe596c7 100644
--- a/aore/search/search.py
+++ b/aore/search/search.py
@@ -8,6 +8,7 @@ import sphinxapi
 
 from aore.config import basic
 from aore.config import sphinx_conf
+from aore.miscutils.exceptions import FiasException
 from aore.miscutils.trigram import trigram
 from wordentry import WordEntry
 from wordvariation import VariationType
@@ -143,6 +144,9 @@ class SphinxSearch:
         if basic.logging:
             logging.info("Sphinx time for {} = {}".format(text, elapsed_t))
 
+        if rs is None:
+            raise FiasException("Cannot find sentence.")
+
         results = []
         parsed_ids = []