未验证 提交 7d3603a3 编写于 作者: R Rongfeng Fu 提交者: GitHub

fix init bug (#18)

上级 73283db4
...@@ -50,7 +50,7 @@ def init_dir(server, client, key, path, link_path=None): ...@@ -50,7 +50,7 @@ def init_dir(server, client, key, path, link_path=None):
ret = client.execute_command('mkdir -p %s' % path) ret = client.execute_command('mkdir -p %s' % path)
if ret: if ret:
if link_path: if link_path:
client.execute_command("if [ '%s' -ef '%s' ]; then ln -sf %s %s; fi" % (path, link_path, path, link_path)) client.execute_command("if [ ! '%s' -ef '%s' ]; then ln -sf %s %s; fi" % (path, link_path, path, link_path))
return True return True
else: else:
critical('fail to initialize %s %s path: %s permission denied' % (server, key, ret.stderr)) critical('fail to initialize %s %s path: %s permission denied' % (server, key, ret.stderr))
...@@ -124,7 +124,7 @@ def init(plugin_context, *args, **kwargs): ...@@ -124,7 +124,7 @@ def init(plugin_context, *args, **kwargs):
ret = client.execute_command('mkdir -p %s/sstable' % data_path) ret = client.execute_command('mkdir -p %s/sstable' % data_path)
if ret: if ret:
link_path = '%s/store' % home_path link_path = '%s/store' % home_path
client.execute_command("if [ '%s' -ef '%s' ]; then ln -sf %s %s; fi" % (path, link_path, path, link_path)) client.execute_command("if [ ! '%s' -ef '%s' ]; then ln -sf %s %s; fi" % (data_path, link_path, data_path, link_path))
for key in ['clog', 'ilog', 'slog']: for key in ['clog', 'ilog', 'slog']:
# init_dir(server, client, key, server_config['%s_dir' % key], os.path.join(data_path, key)) # init_dir(server, client, key, server_config['%s_dir' % key], os.path.join(data_path, key))
log_dir = server_config['%s_dir' % key] log_dir = server_config['%s_dir' % key]
...@@ -144,7 +144,7 @@ def init(plugin_context, *args, **kwargs): ...@@ -144,7 +144,7 @@ def init(plugin_context, *args, **kwargs):
ret = client.execute_command('mkdir -p %s' % log_dir) ret = client.execute_command('mkdir -p %s' % log_dir)
if ret: if ret:
link_path = '%s/%s' % (data_path, key) link_path = '%s/%s' % (data_path, key)
client.execute_command("if [ '%s' -ef '%s' ]; then ln -sf %s %s; fi" % (path, link_path, path, link_path)) client.execute_command("if [ ! '%s' -ef '%s' ]; then ln -sf %s %s; fi" % (log_dir, link_path, log_dir, link_path))
else: else:
critical('failed to initialize %s %s dir' % (server, key)) critical('failed to initialize %s %s dir' % (server, key))
else: else:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册