haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3591 from haiwen/repair-code

Browse Source 
try import seafevents
This commit is contained in:
Daniel Pan
2019-05-30 18:14:40 +08:00
committed by GitHub
parent 38198e63eb bd6fb5b6fb
commit f9953d1be4
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
seahub/utils/__init__.py
View File

@@ -61,8 +61,12 @@ except ImportError:
# init Seafevents API # init Seafevents API
if EVENTS_CONFIG_FILE: if EVENTS_CONFIG_FILE:
from seafevents import seafevents_api try:
seafevents_api.init(EVENTS_CONFIG_FILE) from seafevents import seafevents_api
seafevents_api.init(EVENTS_CONFIG_FILE)
except ImportError:
logging.exception('Failed to import seafevents package.')
seafevents_api = None
else: else:
class RPCProxy(object): class RPCProxy(object):
def __getattr__(self, name): def __getattr__(self, name):
@@ -554,10 +558,14 @@ if EVENTS_CONFIG_FILE:
parsed_events_conf = ConfigParser.ConfigParser() parsed_events_conf = ConfigParser.ConfigParser()
parsed_events_conf.read(EVENTS_CONFIG_FILE) parsed_events_conf.read(EVENTS_CONFIG_FILE)
import seafevents try:
import seafevents
EVENTS_ENABLED = True EVENTS_ENABLED = True
SeafEventsSession = seafevents.init_db_session_class(EVENTS_CONFIG_FILE) SeafEventsSession = seafevents.init_db_session_class(EVENTS_CONFIG_FILE)
except ImportError:
logging.exception('Failed to import seafevents package.')
seafevents = None
EVENTS_ENABLED = False
@contextlib.contextmanager @contextlib.contextmanager
def _get_seafevents_session(): def _get_seafevents_session():