tarantoolctl: support user level configuration file

~/.config/tarantool superseeds /etc/default, not augments it

extra/dist/tarantoolctl

@@ -106,25 +106,22 @@ local fiber = require 'fiber'
 
 ffi.cdef[[ int kill(int pid, int sig); ]]
 
-configs = {
-  system = nil,
-  user   = os.getenv('HOME') .. '/.config/tarantool/tarantool',
-}
-
-if not fio.stat(configs.user) then
-    configs.user = nil
-end
-
-config_list = {
-    '/etc/sysconfig/tarantool',
-    '/etc/default/tarantool',
-    '/usr/local/etc/tarantool/tarantool',
-}
+local config_file = os.getenv('HOME') .. '/.config/tarantool/tarantool'
+local usermode = true
+
+if not fio.stat(config_file) then
+    usermode = false
+    local config_list = {
+        '/etc/sysconfig/tarantool',
+        '/etc/default/tarantool',
+        '/usr/local/etc/tarantool/tarantool',
+    }
 
-for _, c in pairs(config_list) do
-    if fio.stat(c) then
-        configs.system = c
-        break
+    for _, c in pairs(config_list) do
+        if fio.stat(c) then
+            config_file = c
+            break
+        end
     end
 end
 
@@ -134,15 +131,14 @@ local available_commands = {
     'logrotate',
     'status',
     'enter',
-    'restart'
+    'restart',
+    'reload'
 }
 
 local function usage()
     log.error("Usage: %s {%s} instance_name",
         arg[0], table.concat(available_commands, '|'))
-    for c, f in pairs(configs) do
-        log.error("Config [%6s]: %s", c, f)
-    end
+    log.error("Config file: %s", config_file)
     os.exit(1)
 end
 
@@ -190,18 +186,16 @@ shift_argv(arg, 0, 2)
 
 local instance_lua = nil
 
-for _, c in pairs({'user', 'system'}) do
-    dofile(configs[c])
-    if instance_dir then
-        instance_lua = fio.pathjoin(instance_dir, instance .. '.lua')
-        if fio.stat(instance_lua) then
-            log.info('Found %s.lua in %s', instance, instance_dir)
-            break
-        end
+
+dofile(config_file)
+if instance_dir then
+    instance_lua = fio.pathjoin(instance_dir, instance .. '.lua')
+    if fio.stat(instance_lua) then
+        log.info('Found %s.lua in %s', instance, instance_dir)
     end
-    instance_dir = nil
-    instance_lua = nil
 end
+instance_dir = nil
+instance_lua = nil
 
 if default_cfg == nil then
     default_cfg = {}
@@ -217,7 +211,10 @@ default_cfg.wal_dir    = default_cfg.wal_dir and default_cfg.wal_dir or "/var/li
 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"
 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"
+-- change user name only if not running locally
+if not usermode then
+    default_cfg.username = default_cfg.username and default_cfg.username or "tarantool"
+end
 
 -- create  a path to the control socket (admin console)
 local console_sock = fio.pathjoin(default_cfg.pid_file, instance .. '.control')
@@ -237,7 +234,7 @@ local function mkdir(dirname)
         os.exit(-1)
     end
 
-    if not fio.chown(dirname, default_cfg.username, default_cfg.username) then
+    if not usermode and not fio.chown(dirname, default_cfg.username, default_cfg.username) then
         log.error("Can't chown(%s, %s, %s): %s",
             default_cfg.username, default_cfg.username, dirname, errno.strerror())
     end
@@ -334,7 +331,14 @@ end
 function start()
     log.info("Starting instance...")
     box.cfg = wrapper_cfg
-    dofile(instance_lua)
+    local success, data = pcall(dofile, instance_lua)
+    -- if load fails - show last 10 lines of the log file
+    if not success then
+        print('Start failed: ' .. data)
+        if fio.stat(default_cfg.logger) then
+            os.execute('tail -n 10 ' .. default_cfg.logger)
+        end
+    end
 end
 
 
@@ -388,6 +392,7 @@ elseif cmd == 'enter' then
 elseif cmd == 'status' then
     if fio.stat(force_cfg.pid_file) == nil then
         if errno() == errno.ENOENT then
+            print(instance .. ' is stopped (pid file does not exist)')
             os.exit(1)
         end
         log.error("Cant access pidfile %s: %s",
@@ -414,7 +419,16 @@ elseif cmd == 'status' then
     end
 
     s:close()
+    print(instance .. ' is running (pid:' .. force_cfg.pid_file .. ')')
     os.exit(0)
+elseif cmd == 'reload' then
+    if fio.stat(arg[2]) == nil then
+        if errno() == errno.ENOENT then
+            print(arg[2] .. ': file not found')
+            os.exit(1)
+        end
+    end
+    dofile(arg[2])
 else
     log.error("Unknown command '%s'", cmd)
     os.exit(-1)