read ccnet addr:port from ccnet.conf

thirdpart/seaserv/__init__.py

@@ -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_org_id_by_repo_id
 
-from service import CCNET_CONF_PATH
+from service import CCNET_CONF_PATH, CCNET_SERVER_ADDR, CCNET_SERVER_PORT
 

thirdpart/seaserv/service.py

@@ -36,6 +36,7 @@ from datetime import datetime
 import json
 import os
 import sys
+import ConfigParser
 
 import ccnet
 import seafile
@@ -61,6 +62,26 @@ monitor_rpc = seafile.MonitorRpcClient(pool)
 seafserv_rpc = seafile.ServerRpcClient(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 ####
 

utils.py

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