diff --git a/seahub/search/utils.py b/seahub/search/utils.py index 9c08feea4c..1feadc4c18 100644 --- a/seahub/search/utils.py +++ b/seahub/search/utils.py @@ -14,12 +14,15 @@ from seahub.utils import get_user_repos from seahub.base.templatetags.seahub_tags import email2nickname, \ email2contact_email from seahub.constants import REPO_TYPE_WIKI +from seahub.utils import HAS_FILE_SEARCH import seaserv from seaserv import seafile_api os.environ['EVENTS_CONFIG_FILE'] = EVENTS_CONFIG_FILE -from seafes import es_search, es_wiki_search + +if HAS_FILE_SEARCH: + from seafes import es_search, es_wiki_search # Get an instance of a logger logger = logging.getLogger(__name__) diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py index 427465058f..a467403f0a 100644 --- a/seahub/utils/__init__.py +++ b/seahub/utils/__init__.py @@ -1248,6 +1248,8 @@ if EVENTS_CONFIG_FILE: HAS_FILE_SEARCH = check_search_enabled() HAS_FILE_SEASEARCH = check_seasearch_enabled() + if HAS_FILE_SEARCH and HAS_FILE_SEASEARCH: + raise Exception('ES and seasearch cannot be configured simultaneously.') # repo auto delete related ENABLE_REPO_AUTO_DEL = False