haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-08-31 15:11:08 +00:00
Code Issues Releases Wiki Activity

Merge the functions of ccnet-server into seafile-server (#293)

Browse Source 
* merge the api of ccnet into seafile

* merge the api of ccnet into seafile

* Dont't need to include the header

* merge the api of ccnet into seafile

* add enable ldap

* The unit test dont't need to start ccnet-server

* Modify some funcion names and fuse don't need org management

* Modify indent
This commit is contained in:
feiniks
2020-04-15 10:21:04 +08:00
committed by GitHub
parent 500e35fe9b
commit 52586639ac
32 changed files with 6769 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/seaserv/service.py
View File

@@ -33,12 +33,10 @@ SEAFILE_CONF_DIR = _load_path_from_env('SEAFILE_CONF_DIR')
SEAFILE_CENTRAL_CONF_DIR = _load_path_from_env('SEAFILE_CENTRAL_CONF_DIR', check=False)
SEAFILE_RPC_PIPE_PATH = _load_path_from_env ("SEAFILE_RPC_PIPE_PATH", check=False)
ccnet_pipe_path = os.path.join (CCNET_CONF_PATH, 'ccnet-rpc.sock')
ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(ccnet_pipe_path)
seafile_pipe_path = os.path.join(SEAFILE_RPC_PIPE_PATH if SEAFILE_RPC_PIPE_PATH else SEAFILE_CONF_DIR,
'seafile.sock')
seafserv_threaded_rpc = seafile.ServerThreadedRpcClient(seafile_pipe_path)
ccnet_threaded_rpc = seafserv_threaded_rpc
# load ccnet server addr and port from ccnet.conf.
# 'addr:port' is used when downloading a repo