haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 15:38:15 +00:00
Code Issues Releases Wiki Activity

read ccnet addr:port from ccnet.conf

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
thirdpart/seaserv/__init__.py
View File

@@ -13,5 +13,5 @@ from service import create_org, get_orgs_by_user, get_org_by_url_prefix, \
get_user_current_org, add_org_user, remove_org_user, get_org_by_id, \ get_user_current_org, add_org_user, remove_org_user, get_org_by_id, \
get_org_id_by_repo_id get_org_id_by_repo_id
from service import CCNET_CONF_PATH from service import CCNET_CONF_PATH, CCNET_SERVER_ADDR, CCNET_SERVER_PORT

21
thirdpart/seaserv/service.py
View File

@@ -36,6 +36,7 @@ from datetime import datetime
import json import json
import os import os
import sys import sys
import ConfigParser
import ccnet import ccnet
import seafile import seafile
@@ -60,6 +61,26 @@ ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(pool, req_pool=True)
monitor_rpc = seafile.MonitorRpcClient(pool) monitor_rpc = seafile.MonitorRpcClient(pool)
seafserv_rpc = seafile.ServerRpcClient(pool, req_pool=True) seafserv_rpc = seafile.ServerRpcClient(pool, req_pool=True)
seafserv_threaded_rpc = seafile.ServerThreadedRpcClient(pool, req_pool=True) seafserv_threaded_rpc = seafile.ServerThreadedRpcClient(pool, req_pool=True)
# load ccnet server addr and port from ccnet.conf.
# 'addr:port' is used when downloading a repo
ccnet_config = ConfigParser.ConfigParser()
ccnet_config.read(os.path.join(CCNET_CONF_PATH, 'ccnet.conf'))
if ccnet_config.has_option('General', 'SERVICE_URL') and \
ccnet_config.has_option('Network', 'PORT'):
service_url = ccnet_config.get('General', 'SERVICE_URL').lstrip('http://')
if ':' in service_url:
# strip http port such as ':8000' in 'http://192.168.1.101:8000'
idx = service_url.rindex(':')
service_url = service_url[:idx]
CCNET_SERVER_ADDR = service_url
CCNET_SERVER_PORT = ccnet_config.get('Network', 'PORT')
else:
print "Warning: SERVICE_URL not set in ccnet.conf"
CCNET_SERVER_ADDR = None
CCNET_SERVER_PORT = None
#### Basic ccnet API #### #### Basic ccnet API ####

9
utils.py
View File

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