1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 23:20:51 +00:00

read ccnet addr:port from ccnet.conf

This commit is contained in:
lins05
2012-08-03 11:50:57 +08:00
parent 6696a04a97
commit bd6000ff90
3 changed files with 25 additions and 7 deletions

View File

@@ -13,7 +13,7 @@ from django.core.files.uploadhandler import FileUploadHandler, StopFutureHandler
from django.core.cache import cache
from seaserv import seafserv_rpc, ccnet_threaded_rpc, seafserv_threaded_rpc, \
get_repo, get_commits, get_group_repoids
get_repo, get_commits, get_group_repoids, CCNET_SERVER_ADDR, CCNET_SERVER_PORT
try:
from settings import CROCODOC_API_TOKEN
except ImportError:
@@ -293,11 +293,8 @@ def gen_file_get_url(token, filename):
return '%s/files/%s/%s' % (get_httpserver_root(), token, filename)
def get_ccnet_server_addr_port():
"""Return ccnet <ip or domain>:<port>"""
try:
return settings.CCNET_SERVER_ADDR, settings.CCNET_SERVER_PORT
except:
return None, None
"""get ccnet server host and port"""
return CCNET_SERVER_ADDR, CCNET_SERVER_PORT
def emails2list(emails):
"""