소스 검색

HUE-3719 [editor] Editor should fail gracefully if search is disabled/blacklisted

Romain Rigaux 9 년 전
부모
커밋
fcfd2c0
2개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 0 1
      desktop/libs/notebook/src/notebook/connectors/hiveserver2.py
  2. 6 2
      desktop/libs/notebook/src/notebook/connectors/solr.py

+ 0 - 1
desktop/libs/notebook/src/notebook/connectors/hiveserver2.py

@@ -27,7 +27,6 @@ else:
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 
-from desktop.conf import APP_BLACKLIST
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.i18n import force_unicode
 from desktop.models import DefaultConfiguration

+ 6 - 2
desktop/libs/notebook/src/notebook/connectors/solr.py

@@ -22,8 +22,6 @@ from django.utils.translation import ugettext as _
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.i18n import force_unicode
 
-from libsolr.api import SolrApi as NativeSolrApi
-
 from notebook.connectors.base import Api, QueryError
 from notebook.models import escape_rows
 
@@ -31,6 +29,12 @@ from notebook.models import escape_rows
 LOG = logging.getLogger(__name__)
 
 
+try:
+  from libsolr.api import SolrApi as NativeSolrApi
+except ImportError, e:
+  LOG.exception('Search is not enabled')
+
+
 def query_error_handler(func):
   def decorator(*args, **kwargs):
     try: