Merge pull request #277 from haiwen/clear_ccnet_conf

Clear unused ccnet conf options.
haiwen · Oct 22, 2019 · cafce2b · cafce2b
2 parents c9b2929 + ccb7f77
commit cafce2b
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/python/seaserv/service.py b/python/seaserv/service.py
@@ -50,22 +50,16 @@ def _load_path_from_env(key, check=True):
 
     SERVICE_URL = service_url
     CCNET_SERVER_ADDR = hostname
-    if config.has_option('Network', 'PORT'):
-        CCNET_SERVER_PORT = config.get('Network', 'PORT')
-    else:
-        CCNET_SERVER_PORT = 10001
 else:
     print("Warning: SERVICE_URL not set in ccnet.conf")
     CCNET_SERVER_ADDR = None
-    CCNET_SERVER_PORT = None
     SERVICE_URL = None
 
 if config.has_option('LDAP', 'HOST'):
     LDAP_HOST = config.get('LDAP', 'HOST')
 else:
     LDAP_HOST = None
 
-SERVER_ID = config.get('General', 'ID')
 config.read(os.path.join(SEAFILE_CENTRAL_CONF_DIR if SEAFILE_CENTRAL_CONF_DIR else SEAFILE_CONF_DIR,
                          'seafile.conf'))