From 6eaefffe054e36eca59626639ee5e849aaa5e019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=81=A5=E8=BE=89?= Date: Thu, 30 May 2019 17:57:08 +0800 Subject: [PATCH 1/2] try import seafevents --- seahub/utils/__init__.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py index 72f04b4d4a..66a54d8063 100644 --- a/seahub/utils/__init__.py +++ b/seahub/utils/__init__.py @@ -61,8 +61,12 @@ except ImportError: # init Seafevents API if EVENTS_CONFIG_FILE: - from seafevents import seafevents_api - seafevents_api.init(EVENTS_CONFIG_FILE) + try: + from seafevents import seafevents_api + seafevents_api.init(EVENTS_CONFIG_FILE) + except ImportError: + logging.exception('Failed to import seafevents package.') + seafevents_api = None else: class RPCProxy(object): def __getattr__(self, name): @@ -554,7 +558,11 @@ if EVENTS_CONFIG_FILE: parsed_events_conf = ConfigParser.ConfigParser() parsed_events_conf.read(EVENTS_CONFIG_FILE) - import seafevents + try: + import seafevents + except ImportError: + logging.exception('Failed to import seafevents package.') + seafevents = None EVENTS_ENABLED = True SeafEventsSession = seafevents.init_db_session_class(EVENTS_CONFIG_FILE) From bd6fb5b6fbc2c4b546c206d12a2f86b5923fc371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=81=A5=E8=BE=89?= Date: Thu, 30 May 2019 18:07:07 +0800 Subject: [PATCH 2/2] repair code --- seahub/utils/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py index 66a54d8063..435e758cf0 100644 --- a/seahub/utils/__init__.py +++ b/seahub/utils/__init__.py @@ -560,12 +560,12 @@ if EVENTS_CONFIG_FILE: try: import seafevents + EVENTS_ENABLED = True + SeafEventsSession = seafevents.init_db_session_class(EVENTS_CONFIG_FILE) except ImportError: logging.exception('Failed to import seafevents package.') seafevents = None - - EVENTS_ENABLED = True - SeafEventsSession = seafevents.init_db_session_class(EVENTS_CONFIG_FILE) + EVENTS_ENABLED = False @contextlib.contextmanager def _get_seafevents_session():