From 1b7305f1c6200a44810e916bb257e6e39b2d2651 Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Fri, 26 Sep 2014 14:14:33 +0400
Subject: [PATCH] dist: sophia_dir support
---
extra/dist/default/tarantool | 11 ++++++-----
extra/dist/dist.lua | 29 ++++++++++++++++++-----------
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/extra/dist/default/tarantool b/extra/dist/default/tarantool
index 81faf68920..1beedc5e3a 100644
--- a/extra/dist/default/tarantool
+++ b/extra/dist/default/tarantool
@@ -1,10 +1,11 @@
-- Options for Tarantool
default_cfg = {
- pid_file = "/var/run/tarantool", -- will become pid_file .. instance .. '.pid'
- wal_dir = "/var/lib/tarantool", -- will become wal_dir/instance/
- snap_dir = "/var/lib/tarantool", -- snap_dir/instance/
- logger = "/var/log/tarantool", -- logger/instance .. '.log'
- username = "tarantool",
+ pid_file = "/var/run/tarantool", -- will become pid_file .. instance .. '.pid'
+ wal_dir = "/var/lib/tarantool", -- will become wal_dir/instance/
+ snap_dir = "/var/lib/tarantool", -- snap_dir/instance/
+ sophia_dir = "/var/lig/tarantool/sophia", -- will become sophia_dir/sophia/instance/
+ logger = "/var/log/tarantool", -- logger/instance .. '.log'
+ username = "tarantool",
}
instance_dir = "/etc/tarantool/instances.enabled"
diff --git a/extra/dist/dist.lua b/extra/dist/dist.lua
index e103a2de90..e7e8519167 100755
--- a/extra/dist/dist.lua
+++ b/extra/dist/dist.lua
@@ -31,6 +31,9 @@ The file contains common default instances options:
-- snap_dir/instance/
snap_dir = "/var/lib/tarantool",
+
+ -- sophia_dir/instance/
+ sophia_dir = "/var/lib/tarantool/sophia",
-- logger/instance .. '.log'
logger = "/var/log/tarantool",
@@ -111,19 +114,21 @@ if instance_dir == nil then
instance_dir = '/etc/tarantool/instances.enabled'
end
-default_cfg.pid_file = default_cfg.pid_file and default_cfg.pid_file or "/var/run/tarantool"
-default_cfg.wal_dir = default_cfg.wal_dir and default_cfg.wal_dir or "/var/lib/tarantool"
-default_cfg.snap_dir = default_cfg.snap_dir and default_cfg.snap_dir or "/var/lib/tarantool"
-default_cfg.logger = default_cfg.logger and default_cfg.logger or "/var/log/tarantool"
-default_cfg.username = default_cfg.username and default_cfg.username or "tarantool"
+default_cfg.pid_file = default_cfg.pid_file and default_cfg.pid_file or "/var/run/tarantool"
+default_cfg.wal_dir = default_cfg.wal_dir and default_cfg.wal_dir or "/var/lib/tarantool"
+default_cfg.snap_dir = default_cfg.snap_dir and default_cfg.snap_dir or "/var/lib/tarantool"
+default_cfg.sophia_dir = default_cfg.sophia_dir and default_cfg.sophia_dir or "/var/lib/tarantool/sophia"
+default_cfg.logger = default_cfg.logger and default_cfg.logger or "/var/log/tarantool"
+default_cfg.username = default_cfg.username and default_cfg.username or "tarantool"
-- create a path to the control socket (admin console)
local console_sock = fio.pathjoin(default_cfg.pid_file, instance .. '.control')
-default_cfg.pid_file = fio.pathjoin(default_cfg.pid_file, instance .. '.pid')
-default_cfg.wal_dir = fio.pathjoin(default_cfg.wal_dir, instance)
-default_cfg.snap_dir = fio.pathjoin(default_cfg.snap_dir, instance)
-default_cfg.logger = fio.pathjoin(default_cfg.logger, instance .. '.log')
+default_cfg.pid_file = fio.pathjoin(default_cfg.pid_file, instance .. '.pid')
+default_cfg.wal_dir = fio.pathjoin(default_cfg.wal_dir, instance)
+default_cfg.snap_dir = fio.pathjoin(default_cfg.snap_dir, instance)
+default_cfg.sophia_dir = fio.pathjoin(default_cfg.sophia_dir, instance)
+default_cfg.logger = fio.pathjoin(default_cfg.logger, instance .. '.log')
local instance_lua = fio.pathjoin(instance_dir, instance .. '.lua')
@@ -146,16 +151,18 @@ function mk_default_dirs(cfg)
if fio.stat(pid_dir) == nil then
mkdir(pid_dir)
end
-
-- create wal_dir
if fio.stat(cfg.wal_dir) == nil then
mkdir(cfg.wal_dir)
end
-
-- create snap_dir
if fio.stat(cfg.snap_dir) == nil then
mkdir(cfg.snap_dir)
end
+ -- create sophia_dir
+ if fio.stat(cfg.sophia_dir) == nil then
+ mkdir(cfg.sophia_dir)
+ end
-- create log_dir
log_dir = fio.dirname(cfg.logger)
if log_dir:find('|') == nil and fio.stat(log_dir) == nil then
--
GitLab