commit - 1e242024ee7a547943355b11398c686c52cf4c98
commit + d1afa82aaa98c9340e3ddd78aa76f99395124242
blob - /dev/null
blob + 0c1e3bcc16015d762594c1fcb845459192baab7f (mode 644)
--- /dev/null
+++ changelogs/unreleased/gh-8613-embed-conf-module.md
+## feature/cli
+
+* Introduced new command-line options --name and --config
+ and changed default behaviour on executing tarantool (gh-8613).
blob - ba61f1ad1aab8c58abef339005c4f5c1dc149575
blob + fd0fc4b2c1c6e716d0098ec978f1ea46b9e53f20
--- doc/man/tarantool.pod
+++ doc/man/tarantool.pod
=over
+=item -c, --config
+
+Set a path to a config file.
+
+=item -n, --name
+
+Set an instance name.
+
=item -h, --help
Display the help screen and exit.
blob - c2d5dd53ec06ba6ce6d8763fa653240cc9f99844
blob + 28db060ba3102a13c688152a8568832f998188f6
--- src/lua/init.c
+++ src/lua/init.c
{
struct lua_State *L = va_arg(ap, struct lua_State *);
const char *path = va_arg(ap, const char *);
+ const char *instance_name = va_arg(ap, const char *);
+ const char *config_path = va_arg(ap, const char *);
uint32_t opt_mask = va_arg(ap, uint32_t);
int optc = va_arg(ap, int);
const char **optv = va_arg(ap, const char **);
int is_a_tty = isatty(STDIN_FILENO);
+ if (instance_name && config_path) {
+ if (lua_require_lib(L, "conf") != 0)
+ goto error;
+ lua_pushstring(L, "startup");
+ lua_gettable(L, -2);
+ lua_pushstring(L, instance_name);
+ lua_pushstring(L, config_path);
+ if (luaT_call(L, 2, 1) != 0)
+ goto error;
+ lua_settop(L, 0);
+ goto end;
+ }
if (bytecode) {
if (lua_require_lib(L, "internal.dobytecode") != 0)
goto error;
}
int
-tarantool_lua_run_script(char *path, uint32_t opt_mask,
- int optc, const char **optv, int argc, char **argv)
+tarantool_lua_run_script(char *path, const char *instance_name, const char *config_path,
+ uint32_t opt_mask, int optc, const char **optv, int argc, char **argv)
{
const char *title = path ? basename(path) : "interactive";
/*
*/
struct diag script_diag;
diag_create(&script_diag);
- fiber_start(script_fiber, tarantool_L, path, opt_mask,
- optc, optv, argc, argv, &script_diag);
+ fiber_start(script_fiber, tarantool_L, path, instance_name, config_path,
+ opt_mask, optc, optv, argc, argv, &script_diag);
/*
* Run an auxiliary event loop to re-schedule run_script fiber.
blob - 91f8854559b1ce2ec8f5fc53735491cc0166ab35
blob + 49985899d9dcf971173805d354893948defb55ab
--- src/lua/init.h
+++ src/lua/init.h
* error is set.
*/
int
-tarantool_lua_run_script(char *path, uint32_t opt_mask,
+tarantool_lua_run_script(char *path, const char *instance_name,
+ const char* config_path, uint32_t opt_mask,
int optc, const char **optv,
int argc, char **argv);
blob - 6f48982fbdc8e6c8eba38c1355281c8d905728c1
blob + 04d83841caa7dec6cfd8742e0b092861c564111e
--- src/main.cc
+++ src/main.cc
static pid_t master_pid = getpid();
static struct pidfh *pid_file_handle;
-static char *script = NULL;
static char *pid_file = NULL;
static char **main_argv;
static int main_argc;
static void
print_help(const char *program)
{
- puts("Tarantool - a Lua application server");
+ printf("Tarantool %s\n", (char *)tarantool_version());
puts("");
- printf("Usage: %s script.lua [OPTIONS] [SCRIPT [ARGS]]\n", program);
+ printf("Start an instance: %s --config <path> --name <instance_name>", program);
puts("");
- puts("All command line options are passed to the interpreted script.");
- puts("When no script name is provided, the server responds to:");
+ puts("Connect to an instance: tt connect <uri>");
+ puts("");
+ printf("Usage: %s [OPTIONS]\n", program);
+ puts("");
+ puts(" -c, --config <path>\t\tset a path to config file");
+ puts(" -n, --name <instance_name>\tset an instance name");
+ puts(" -s, --script <path>\t\tset a path to a Lua script file");
puts(" -h, --help\t\t\tdisplay this help and exit");
puts(" -v, --version\t\t\tprint program version and exit");
puts(" -e EXPR\t\t\texecute string 'EXPR'");
puts(" -l NAME\t\t\trequire library 'NAME'");
puts(" -j cmd\t\t\tperform LuaJIT control command");
puts(" -b ...\t\t\tsave or list bytecode");
- puts(" -d\t\t\t\tactivate debugging session for 'SCRIPT'");
- puts(" -i\t\t\t\tenter interactive mode after executing 'SCRIPT'");
- puts(" --\t\t\t\tstop handling options");
- puts(" -\t\t\t\texecute stdin and stop handling options");
+ puts(" -d\t\t\t\tactivate debugging session for script");
+ puts(" -i\t\t\t\tenter interactive mode after executing script");
puts("");
puts("Please visit project home page at https://tarantool.org");
puts("to see online documentation, submit bugs or contribute a patch.");
int optc_max = (argc - 1) * 2;
auto guard = make_scoped_guard([&optc, &optv]{ if (optc) free(optv); });
+ static char *instance_name = NULL;
+ static char *config_path = NULL;
+ static char *script = NULL;
+
static struct option longopts[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'},
+ {"config", required_argument, 0, 'c'},
+ {"name", required_argument, 0, 'n'},
+ {"repl", no_argument, 0, 'r'},
{NULL, 0, 0, 0},
};
- static const char *opts = "+hVvb::ij:e:l:d";
+ static const char *opts = "+hVvb::ij:e:l:d:c::n::s::r";
int ch;
bool lj_arg = false;
while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) {
switch (ch) {
+ case 'n':
+ if (optarg == NULL) {
+ printf("instance name is required\n");
+ return -1;
+ }
+ instance_name = strdup(optarg);
+ break;
+ case 'c':
+ if (optarg == NULL) {
+ printf("config path is required\n");
+ return -1;
+ }
+ if (access(optarg, R_OK) != 0) {
+ printf("config file is not accessible\n");
+ return -1;
+ }
+ config_path = strdup(optarg);
+ break;
case 'V':
case 'v':
print_version();
case 'h':
print_help(basename(argv[0]));
return 0;
+ case 'r':
case 'i':
/* Force interactive mode */
opt_mask |= O_INTERACTIVE;
break;
}
+ if (instance_name && (!config_path)) {
+ printf("--config is required\n");
+ return -1;
+ }
+ if (config_path && !instance_name) {
+ printf("--name is required\n");
+ return -1;
+ }
+
/* Shift arguments */
argc = 1 + (argc - optind);
for (int i = 1; i < argc; i++)
argv[i] = argv[optind + i - 1];
- /*
- * The corresponding check is omitted for `O_BYTECODE`
- * since it is present in `bcsave.lua` module, which
- * performs the bytecode dump.
- */
- if (!(opt_mask & O_BYTECODE) && argc > 1 &&
- strcmp(argv[1], "-") && access(argv[1], R_OK) != 0) {
- /*
- * Somebody made a mistake in the file
- * name. Be nice: open the file to set
- * errno.
- */
- int fd = open(argv[1], O_RDONLY);
- int save_errno = errno;
- if (fd >= 0)
- close(fd);
- printf("Can't open script %s: %s\n",
- argv[1], tt_strerror(save_errno));
- return save_errno;
+
+ if (!script &&
+ !(opt_mask & O_INTERACTIVE) &&
+ !(opt_mask & O_BYTECODE) &&
+ !(instance_name && config_path) &&
+ !optv) {
+ print_help(basename(argv[0]));
+ return 0;
}
argv = title_init(argc, argv);
*/
const char *tarantool_bin = find_path(argv[0]);
- if (!tarantool_bin)
+ if (!tarantool_bin) {
tarantool_bin = argv[0];
- if (argc > 1) {
- argv++;
- argc--;
- script = argv[0];
- title_set_script_name(argv[0]);
+ title_set_script_name(script);
}
strlcpy(tarantool_path, tarantool_bin, sizeof(tarantool_path));
if (strlen(tarantool_path) < strlen(tarantool_bin))
* is why script must run only after the server was fully
* initialized.
*/
- if (tarantool_lua_run_script(script, opt_mask, optc, optv,
+ if (tarantool_lua_run_script(script, instance_name, config_path,
+ opt_mask, optc, optv,
main_argc, main_argv) != 0)
diag_raise();
/*
ev_run(loop(), 0);
}
/* freeing resources */
+ free(instance_name);
+ free(config_path);
tarantool_free();
ERROR_INJECT(ERRINJ_MAIN_MAKE_FILE_ON_RETURN, do {
int fd = open("tt_exit_file.txt.inprogress",
