haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-17 00:32:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #896 from haiwen/fix-cluster-mode

Browse Source 
fixed is_cluster_mode
This commit is contained in:
xiez 2015-11-17 10:33:54 +08:00
commit d23a125e56
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/utils/__init__.py
View File

@ -57,7 +57,11 @@ except ImportError:
def is_cluster_mode(): def is_cluster_mode():
cfg = ConfigParser.ConfigParser() cfg = ConfigParser.ConfigParser()
conf = os.path.join(os.environ['SEAFILE_CONF_DIR'], 'seafile.conf') if 'SEAFILE_CENTRAL_CONF_DIR' in os.environ:
confdir = os.environ['SEAFILE_CENTRAL_CONF_DIR']
else:
confdir = os.environ['SEAFILE_CONF_DIR']
conf = os.path.join(confdir, 'seafile.conf')
cfg.read(conf) cfg.read(conf)
if cfg.has_option('cluster', 'enabled'): if cfg.has_option('cluster', 'enabled'):
enabled = cfg.getboolean('cluster', 'enabled') enabled = cfg.getboolean('cluster', 'enabled')