mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-02 07:27:04 +00:00
fixed "import seafevets" when events disabled
This commit is contained in:
19
handlers.py
19
handlers.py
@@ -1,7 +1,17 @@
|
||||
import seafevents
|
||||
from utils import get_seafevents_session
|
||||
import settings
|
||||
|
||||
def repo_created_cb(sender, **kwargs):
|
||||
if not hasattr(settings, 'EVENTS_CONFIG_FILE'):
|
||||
def repo_created_cb(sender, **kwargs):
|
||||
pass
|
||||
|
||||
def repo_deleted_cb(sender, **kwargs):
|
||||
pass
|
||||
else:
|
||||
|
||||
import seafevents
|
||||
from utils import get_seafevents_session
|
||||
|
||||
def repo_created_cb(sender, **kwargs):
|
||||
creator = kwargs['creator']
|
||||
repo_id = kwargs['repo_id']
|
||||
repo_name = kwargs['repo_name']
|
||||
@@ -18,7 +28,7 @@ def repo_created_cb(sender, **kwargs):
|
||||
seafevents.save_user_events (session, 'repo-create', detail, users, None)
|
||||
session.close()
|
||||
|
||||
def repo_deleted_cb(sender, **kwargs):
|
||||
def repo_deleted_cb(sender, **kwargs):
|
||||
"""When a repo is deleted, an event would be added to every user in all
|
||||
groups to which this repo is shared.
|
||||
|
||||
@@ -40,3 +50,4 @@ def repo_deleted_cb(sender, **kwargs):
|
||||
session = get_seafevents_session()
|
||||
seafevents.save_user_events (session, 'repo-delete', detail, users, None)
|
||||
session.close()
|
||||
|
||||
|
12
utils.py
12
utils.py
@@ -13,8 +13,6 @@ from base.models import FileContributors
|
||||
|
||||
from pysearpc import SearpcError
|
||||
|
||||
import seafevents
|
||||
|
||||
from seaserv import seafserv_rpc, ccnet_threaded_rpc, seafserv_threaded_rpc, \
|
||||
get_repo, get_commits, get_group_repoids, CCNET_SERVER_ADDR, \
|
||||
CCNET_SERVER_PORT, get_org_id_by_repo_id, get_org_by_id, is_org_staff, \
|
||||
@@ -410,11 +408,11 @@ def get_file_contributors(repo_id, file_path, file_path_hash, file_id):
|
||||
|
||||
return contributors, last_modified
|
||||
|
||||
seafevents_session = None
|
||||
def get_seafevents_session():
|
||||
if not hasattr(settings, 'EVENTS_CONFIG_FILE'):
|
||||
return None
|
||||
else:
|
||||
|
||||
if hasattr(settings, 'EVENTS_CONFIG_FILE'):
|
||||
import seafevents
|
||||
seafevents_session = None
|
||||
def get_seafevents_session():
|
||||
global seafevents_session
|
||||
|
||||
if not seafevents_session:
|
||||
|
3
views.py
3
views.py
@@ -76,11 +76,10 @@ from settings import FILE_PREVIEW_MAX_SIZE, INIT_PASSWD
|
||||
|
||||
try:
|
||||
from settings import EVENTS_CONFIG_FILE
|
||||
from utils import get_seafevents_session
|
||||
import seafevents
|
||||
except ImportError:
|
||||
EVENTS_CONFIG_FILE = None
|
||||
else:
|
||||
from utils import get_seafevents_session
|
||||
|
||||
@login_required
|
||||
def root(request):
|
||||
|
Reference in New Issue
Block a user