1
0
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:
lins05
2012-10-09 11:22:55 +08:00
parent 1c6a40636c
commit 33d3758631
3 changed files with 50 additions and 42 deletions

View File

@@ -1,3 +1,13 @@
import settings
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
@@ -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()

View File

@@ -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
if hasattr(settings, 'EVENTS_CONFIG_FILE'):
import seafevents
seafevents_session = None
def get_seafevents_session():
if not hasattr(settings, 'EVENTS_CONFIG_FILE'):
return None
else:
global seafevents_session
if not seafevents_session:

View File

@@ -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):